diff --git a/src/editor/sagas.ts b/src/editor/sagas.ts
index 52ffb39b..b74c3676 100644
--- a/src/editor/sagas.ts
+++ b/src/editor/sagas.ts
@@ -265,8 +265,10 @@ function* handleEditorActivateFile(
             );
         }
 
+        editor.pushUndoStop();
         editor.setModel(file.model);
         editor.restoreViewState(file.viewState);
+        editor.pushUndoStop();
         activeFileHistory.push(action.uuid);
 
         editor.focus();