diff --git a/Perspex.Controls/Button.cs b/Perspex.Controls/Button.cs
index cb797c77b8..add630cecd 100644
--- a/Perspex.Controls/Button.cs
+++ b/Perspex.Controls/Button.cs
@@ -203,7 +203,7 @@ namespace Perspex.Controls
 
         private void ListenForDefault(IInputElement root)
         {
-            root.AddHandler(InputElement.KeyDownEvent, this.RootKeyDown, RoutingStrategies.Tunnel);
+            root.AddHandler(InputElement.KeyDownEvent, this.RootKeyDown);
         }
 
         private void StopListeningForDefault(IInputElement root)
diff --git a/Perspex.Controls/MenuItem.cs b/Perspex.Controls/MenuItem.cs
index 3d4f8c3762..dab0be6b70 100644
--- a/Perspex.Controls/MenuItem.cs
+++ b/Perspex.Controls/MenuItem.cs
@@ -263,6 +263,7 @@ namespace Perspex.Controls
                     else
                     {
                         this.RaiseEvent(new RoutedEventArgs(ClickEvent));
+                        e.Handled = true;
                     }
 
                     break;