diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 542d1016b9..100855e92f 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -336,8 +336,10 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 		LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: "
 			<< cmd0 << endl << *this);
 		nextInset()->dispatch(*this, tmpcmd);
-		if (result().dispatched())
+		if (result().dispatched()) {
+			buffer()->undo().endUndoGroup();
 			return;
+		}
 	}
 
 	// store some values to be used inside of the handlers