diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 890b6fa04b..b7bc518385 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -212,6 +212,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             }
         }
 
+        @Override
+        public void windowIconified(WindowEvent e) {
+            // 最小化时 hide工具栏
+            HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTabChange();
+        }
+
     };
 
     private JComponent closeButton = new JComponent() {
diff --git a/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java b/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java
index 285bbc3b8b..44978ad667 100644
--- a/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java
+++ b/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java
@@ -3,8 +3,11 @@ package com.fr.design.designer.ui;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.stable.os.OperatingSystem;
+
 import java.awt.Rectangle;
 import javax.swing.JDialog;
+import javax.swing.JFrame;
 
 /**
  * @author hades
@@ -23,7 +26,7 @@ public class SelectedPopupDialog extends JDialog {
     private boolean canVisible = true;
 
     public SelectedPopupDialog(XCreator creator, FormDesigner designer) {
-        super(DesignerContext.getDesignerFrame());
+        super(OperatingSystem.isMacos() ? new JFrame() : DesignerContext.getDesignerFrame());
         this.setUndecorated(true);
         this.setModal(false);
         this.setFocusableWindowState(false);