diff --git a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java
index 173bd9cd4f..8e63aa815b 100644
--- a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java
+++ b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java
@@ -554,10 +554,12 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
         for (int i = scrollIndex; i <= lastOneIndex; i++) {
             int textWidth = widthArray[i];
             if (evtX >= textX && evtX < textX + textWidth) {
-                if (getSelectedIndex() != i) {
+                boolean needRefreshPropertiesPane = getSelectedIndex() != i;
+                setSelectedIndex(i);
+                if (needRefreshPropertiesPane) {
                     HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
                 }
-                setSelectedIndex(i);
+
                 isBlank = false;
                 reportComposite.setComposite();
                 if (isAuthorityEditing) {
diff --git a/designer_base/src/com/fr/file/FILEChooserPane.java b/designer_base/src/com/fr/file/FILEChooserPane.java
index cdc0c2c0f9..02c92f646b 100644
--- a/designer_base/src/com/fr/file/FILEChooserPane.java
+++ b/designer_base/src/com/fr/file/FILEChooserPane.java
@@ -16,6 +16,7 @@ import com.fr.design.gui.itextfield.UIAutoCompletionField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 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.file.filetree.FileNode;
@@ -475,7 +476,7 @@ public class FILEChooserPane extends BasicPane {
         this.suffix = suffix;
 
 
-        dialog = showWindow((Window) parent, false);
+        dialog = showWindow(parent instanceof DesignerFrame ? (Window) parent : SwingUtilities.getWindowAncestor(parent), false);
         JPanel contentPane = (JPanel) dialog.getContentPane();
         contentPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
         contentPane.add(this, BorderLayout.CENTER);