diff --git a/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml b/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
index 6e3c521..dc10dee 100644
--- a/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
+++ b/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
@@ -36,7 +36,7 @@
         <TextBlock Text="GotFocus to open, LostFocus to close" Margin="0 16" />
         <u:PopConfirm PopupHeader="确定是否要保存此修改？"
                       PopupContent="此修改将不可逆"
-                      TriggerMode="Focus"
+                      TriggerMode="Focus, Click"
                       HorizontalAlignment="Left"
                       Placement="{Binding #placement.Value}"
                       u:ControlClassesInput.Source="{Binding #classInput}"
diff --git a/src/Ursa/Controls/PopConfirm/PopConfirm.cs b/src/Ursa/Controls/PopConfirm/PopConfirm.cs
index f6b43db..33204ec 100644
--- a/src/Ursa/Controls/PopConfirm/PopConfirm.cs
+++ b/src/Ursa/Controls/PopConfirm/PopConfirm.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
@@ -190,7 +191,7 @@ public class PopConfirm : ContentControl
             void OnCanExecuteChanged(object? _, System.EventArgs a)
             {
                 count++;
-                if (count < 1) return;
+                if (count < 2) return;
                 var canExecute = command.CanExecute(button.CommandParameter);
                 if (canExecute)
                 {
@@ -246,8 +247,14 @@ public class PopConfirm : ContentControl
         SetCurrentValue(IsDropdownOpenProperty, false);
     }
 
+    private bool _suppressButtonClickEvent;
     private void OnMainElementGotFocus(object sender, GotFocusEventArgs e)
     {
+        Debug.WriteLine("Got Focus");
+        if (TriggerMode.HasFlag(PopConfirmTriggerMode.Click) && TriggerMode.HasFlag(PopConfirmTriggerMode.Focus))
+        {
+            _suppressButtonClickEvent = true;
+        }
         SetCurrentValue(IsDropdownOpenProperty, true);
     }
 
@@ -262,7 +269,12 @@ public class PopConfirm : ContentControl
 
     private void OnMainButtonClicked(object sender, RoutedEventArgs e)
     {
-        SetCurrentValue(IsDropdownOpenProperty, !IsDropdownOpen);
+        Debug.WriteLine("Main Button Clicked");
+        if (!_suppressButtonClickEvent)
+        {
+            SetCurrentValue(IsDropdownOpenProperty, !IsDropdownOpen);
+        }
+        _suppressButtonClickEvent = false;
     }