diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java
index 234783fa4..735b00736 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java
@@ -2,6 +2,9 @@ package com.fr.design.mainframe.guide.scene;
 
 import com.fr.design.mainframe.guide.base.GuideManager;
 
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.SwingUtilities;
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -71,6 +74,10 @@ public class ClickScene extends AbstractGuideScene{
             @Override
             public void mousePressed(MouseEvent e) {
                 if (isDispatch) {
+                    if (target instanceof AbstractButton) {
+                        AbstractButton b = (AbstractButton) target;
+                        b.setFocusable(false);
+                    }
                     redispatchMouseEvent(e, target);
                 }
             }
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
index ae9616743..1d573cf2b 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
@@ -11,7 +11,6 @@ import com.fr.design.mainframe.CenterRegionContainerPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.EastRegionContainerPane;
-import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.guide.GuideIds;
 import com.fr.design.mainframe.guide.base.Guide;
 import com.fr.design.mainframe.guide.base.GuideBuilder;
@@ -30,9 +29,6 @@ import com.fr.design.utils.ComponentUtils;
 
 import javax.swing.SwingUtilities;
 import java.awt.Component;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.util.Timer;
 import java.util.TimerTask;
 
 public class ThemeToggleGuide {
@@ -141,7 +137,7 @@ public class ThemeToggleGuide {
             @Override
             public boolean prepared() {
                 scene.addClickTarget(ComponentUtils.findComponentByName(themeDialog, TemplateThemeUsingDialog.COMPLETE_BUTTON), ClickScene.ClickType.LEFT, true);
-                scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_Base_Tip_Click_Confirm"), BubbleTip.Direction.TOP);
+                scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_Base_Tip_Click_Complete"), BubbleTip.Direction.TOP);
                 return true;
             }