diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index b9f5ff78a1..766bcbbba4 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* math_cursor.C (home, end): close macro before handling selection
+	(bug 2046)
+
 2005-07-25  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* math_factory.C (initSymbols): Don't require wasysym for the wasy
diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index b44714b806..bd494c800f 100644
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -292,8 +292,8 @@ bool MathCursor::home(bool sel)
 {
 	dump("home 1");
 	autocorrect_ = false;
-	selHandle(sel);
 	macroModeClose();
+	selHandle(sel);
 	if (!par()->idxHome(idx(), pos()))
 		return popLeft();
 	dump("home 2");
@@ -306,8 +306,8 @@ bool MathCursor::end(bool sel)
 {
 	dump("end 1");
 	autocorrect_ = false;
-	selHandle(sel);
 	macroModeClose();
+	selHandle(sel);
 	if (!par()->idxEnd(idx(), pos()))
 		return popRight();
 	dump("end 2");
diff --git a/status.13x b/status.13x
index 654f72cdd1..6e3705b3c6 100644
--- a/status.13x
+++ b/status.13x
@@ -19,6 +19,7 @@ What's new
 
 ** Updates
 
+- Update German Introduction and Tutorial.
 
 ** Bug fixes
 
@@ -26,6 +27,8 @@ What's new
 
 - Don't load the wasysym package automatically anymore (bug 1942)
 
+- Fix crash with S-Home while entering a macro name (bug 2046)
+
 * User Interface:
 
 - Fix wrong path when drag-and-dropping files on Windows. [Qt only]