diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
index 9e4e26f4e0e0..5185c377421f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
@@ -192,7 +192,7 @@ abstract class UndoRedo {
   }
 
   private boolean restore(EditorAndState pair) {
-    if (myEditor == null || pair == null || pair.getEditor() == null) {
+    if (myEditor == null || !myEditor.isValid() || pair == null || pair.getEditor() == null) {
       return false;
     }