diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2e900e10bf..314612f269 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2243,8 +2243,6 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 	if (!inset || !cur.result().dispatched())
 		cur.dispatch(cmd);
 
-	cur.endUndoGroup();
-
 	// Notify left insets
 	if (cur != old) {
 		bool badcursor = old.fixIfBroken() | cur.fixIfBroken();
@@ -2252,7 +2250,9 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 		if (badcursor)
 			cursor().fixIfBroken();
 	}
-	
+
+	cur.endUndoGroup();
+
 	// Do we have a selection?
 	theSelection().haveSelection(cursor().selection());
 
diff --git a/status.21x b/status.21x
index f8f2f53bc5..fd05fd0196 100644
--- a/status.21x
+++ b/status.21x
@@ -160,6 +160,9 @@ What's new
 
 - Erase correctly math multi-cell selections (bug 9747).
 
+- Fix warning about Undo when an empty subscript is automatically deleted in mathed
+  (bug 10022).
+
 * INTERNALS
 
 - Fix parsing problems of class and category declaration line in layout files