diff --git a/src/ChangeLog b/src/ChangeLog
index 35c1287325..05f6715f48 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* text3.C: fix LFUN_MATH_MODE.
+
 2004-12-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* buffer_funcs.C (countWords): new function. Counts words between
diff --git a/src/text3.C b/src/text3.C
index bc341780e3..e103c82f40 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -1318,7 +1318,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_MATH_IMPORT_SELECTION:
 	case LFUN_MATH_MODE:
-		mathDispatch(cur, cmd, false);
+		if (cmd.argument == "on")
+			// don't pass "on" as argument
+			mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
+		else
+			mathDispatch(cur, cmd, false);
 		break;
 
 	case LFUN_MATH_MACRO: