diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index bccdd8004a..cef4db3c6c 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -639,6 +639,7 @@ bool MathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 			inset_cursor.cell().erase(inset_cursor.pos());
 			inset_cursor.cell().insert(inset_cursor.pos(),
 				createInsetMath(unfolded_name, &cur.buffer()));
+			cur.resetAnchor();
 			cur.updateFlags(cur.disp_.update() | Update::SinglePar);
 			return true;
 		}
diff --git a/status.16x b/status.16x
index ac9241c2c4..8b9362ee38 100644
--- a/status.16x
+++ b/status.16x
@@ -183,6 +183,9 @@ What's new
 
 - Make the input completion case sensitive again (bug 6983).
 
+- Fix crash when editing a macro name under some circumstances (for example,
+  when the macro is followed by a script inset and another macro) (bug 6965).
+
 
 * DOCUMENTATION AND LOCALIZATION