diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 7f118c370b..78bbd836be 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/Menu.cs b/src/Avalonia.Controls/Menu.cs
index e919275d4f..994af9dab8 100644
--- a/src/Avalonia.Controls/Menu.cs
+++ b/src/Avalonia.Controls/Menu.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Controls
static Menu()
{
ItemsPanelProperty.OverrideDefaultValue(typeof(Menu), DefaultPanel);
- MenuItem.ClickEvent.AddClassHandler