diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 2b3bbc8ad2..e6866b8142 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -207,7 +207,11 @@ namespace Avalonia.Controls
/// The event args.
protected virtual void OnClick(RoutedEventArgs e)
{
- Command?.Execute(CommandParameter);
+ if (Command != null)
+ {
+ Command.Execute(CommandParameter);
+ e.Handled = true;
+ }
}
///
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 3d15ed99e7..3d66fbc51b 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -102,6 +102,11 @@ namespace Avalonia.Controls
AccessKeyHandler.AccessKeyPressedEvent.AddClassHandler