diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
index 4bacf9a85..ce08662ca 100644
--- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
+++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
@@ -29,6 +29,9 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
 import com.fr.file.filetree.FileNode;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.file.filter.FILEFilter;
@@ -45,6 +48,8 @@ import com.fr.stable.os.windows.WindowsDetector;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
 
+import com.fr.workspace.Workspace;
+import com.fr.workspace.WorkspaceEvent;
 import javax.swing.AbstractAction;
 import javax.swing.AbstractListModel;
 import javax.swing.ActionMap;
@@ -66,7 +71,6 @@ import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
@@ -1325,6 +1329,12 @@ public class FILEChooserPane extends BasicPane {
                     LocationButtonPane.this.repaint(10);
                 }
             });
+            EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener<Workspace>() {
+                @Override
+                public void on(Event event, Workspace param) {
+                    setPopDir(null);
+                }
+            });
         }
 
         public void highLightButton(FILE dir) {