diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 4fb218be60..747cf6aef5 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -394,8 +394,11 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
     private boolean isCurrentEditing(String path) {
         JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        String editing = jt.getEditingFILE().getPath();
-        return ComparatorUtils.equals(editing, path);
+        if (JTemplate.isValid(jt)) {
+            String editing = jt.getEditingFILE().getPath();
+            return ComparatorUtils.equals(editing, path);
+        }
+        return false;
     }
 
     /**
@@ -594,9 +597,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                         confirmCloseAndShowVcsNewPane(jTemplate, path);
                         return;
                     }
-                    showVcsNewPane(path);
                 }
             }
+            showVcsNewPane(path);
         }
 
         private void confirmCloseAndShowVcsNewPane(JTemplate<?, ?> specifiedTemplate, String path) {