diff --git a/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml b/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
index bee6bb4..38440a8 100644
--- a/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
+++ b/demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
@@ -22,6 +22,14 @@
                       CancelCommand="{Binding Path=CancelCommand}" >
             <Button Content="Hello World"></Button>
         </u:PopConfirm>
+        <TextBlock Text="Non-button control as main element" Margin="0 16" />
+        <u:PopConfirm PopupHeader="Header" PopupContent="Content" 
+                      TriggerMode="Click"
+                      Placement="BottomEdgeAlignedLeft"
+                      ConfirmCommand="{Binding ConfirmCommand}"
+                      CancelCommand="{Binding Path=CancelCommand}" >
+            <TextBlock Text="Hello World" />
+        </u:PopConfirm>
         <TextBlock Text="Asynchronized command support" Margin="0 16" />
         <u:PopConfirm PopupHeader="Header" PopupContent="Content" 
                       ConfirmCommand="{Binding AsyncConfirmCommand}"
diff --git a/src/Ursa/Controls/PopConfirm/PopConfirm.cs b/src/Ursa/Controls/PopConfirm/PopConfirm.cs
index 3c73cf6..e03dee0 100644
--- a/src/Ursa/Controls/PopConfirm/PopConfirm.cs
+++ b/src/Ursa/Controls/PopConfirm/PopConfirm.cs
@@ -221,7 +221,7 @@ public class PopConfirm : ContentControl
     private void SetupChildrenEventSubscriptions(Control? child, PopConfirmTriggerMode mode)
     {
         if (child is null) return;
-        if (mode == PopConfirmTriggerMode.Tap)
+        if (mode == PopConfirmTriggerMode.Click)
         {
             if (child is Button button)
                 Button.ClickEvent.AddHandler(OnMainButtonClicked, button);
diff --git a/src/Ursa/Controls/PopConfirm/PopConfirmTriggerMode.cs b/src/Ursa/Controls/PopConfirm/PopConfirmTriggerMode.cs
index 8c571fc..5c8cc8c 100644
--- a/src/Ursa/Controls/PopConfirm/PopConfirmTriggerMode.cs
+++ b/src/Ursa/Controls/PopConfirm/PopConfirmTriggerMode.cs
@@ -2,6 +2,6 @@ namespace Ursa.Controls;
 
 public enum PopConfirmTriggerMode
 {
-    Tap,
+    Click,
     Focus,
 }
\ No newline at end of file