diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 7ed1c7fd8c..2b3bbc8ad2 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -234,7 +234,7 @@ namespace Avalonia.Controls
             PseudoClasses.Remove(":pressed");
             e.Handled = true;
 
-            if (ClickMode == ClickMode.Release && Classes.Contains(":pointerover"))
+            if (ClickMode == ClickMode.Release && new Rect(Bounds.Size).Contains(e.GetPosition(this)))
             {
                 RaiseClickEvent();
             }