diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index d323f9ebcc..4467908787 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1358,11 +1358,15 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 		// if there is an inset at cursor, see whether it
 		// can be modified.
 		Inset * inset = cur.nextInset();
-		if (inset)
+		if (inset) {
+			cur.recordUndo();
 			inset->dispatch(cur, tmpcmd);
+		}
 		// if it did not work, try the underlying inset.
-		if (!inset || !cur.result().dispatched())
+		if (!inset || !cur.result().dispatched()) {
+			cur.recordUndo();
 			cur.dispatch(tmpcmd);
+		}
 
 		if (!cur.result().dispatched())
 			// It did not work too; no action needed.
diff --git a/status.16x b/status.16x
index 76be65a065..7720739a93 100644
--- a/status.16x
+++ b/status.16x
@@ -57,8 +57,8 @@ What's new
 - Speed up editing when the document contains paragraphs with many (>1000)
   insets (bug 4443).
 
-- Set buffer status to changed after modifying insets such as pagebreaks
-  or citations via context menu.
+- Set buffer status to changed and record UNDO after modifying insets such
+  as pagebreaks or citations via context menu.
 
 - Improve debug output when tracing what actions are triggered.