diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionEditor.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionEditor.java
index 72f4ab004c13..6cb785c08ee5 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionEditor.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionEditor.java
@@ -120,7 +120,8 @@ public class TerminalSessionEditor extends UserDataHolderBase implements FileEdi
 
   @Override
   public void dispose() {
-    if (!myFile.getUserData(FileEditorManagerImpl.CLOSING_TO_REOPEN)) {
+    Boolean closingToReopen = myFile.getUserData(FileEditorManagerImpl.CLOSING_TO_REOPEN);
+    if (closingToReopen == null || !closingToReopen) {
       myFile.getTerminal().close();
     }
   }