diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 8b22cdd4ec..8537c9acbc 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -304,15 +304,18 @@ namespace Avalonia.Controls
         /// </summary>
         protected virtual void OnClick()
         {
-            OpenFlyout();
+            if (IsEffectivelyEnabled)
+            {
+                OpenFlyout();
 
-            var e = new RoutedEventArgs(ClickEvent);
-            RaiseEvent(e);
+                var e = new RoutedEventArgs(ClickEvent);
+                RaiseEvent(e);
 
-            if (!e.Handled && Command?.CanExecute(CommandParameter) == true)
-            {
-                Command.Execute(CommandParameter);
-                e.Handled = true;
+                if (!e.Handled && Command?.CanExecute(CommandParameter) == true)
+                {
+                    Command.Execute(CommandParameter);
+                    e.Handled = true;
+                }
             }
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
index e7a42c2d93..f4acf5ea37 100644
--- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
@@ -295,6 +295,20 @@ namespace Avalonia.Controls.UnitTests
             target.CommandParameter = false;
             Assert.False(target.IsEffectivelyEnabled);
         }
+        
+        [Fact]
+        public void Button_Invokes_Doesnt_Execute_When_Button_Disabled()
+        {
+            var target = new Button();
+            var raised = 0;
+
+            target.IsEnabled = false;
+            target.Click += (s, e) => ++raised;
+
+            target.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent));
+
+            Assert.Equal(0, raised);
+        }
 
         private class TestButton : Button, IRenderRoot
         {