diff --git a/src/Perspex.Controls/Button.cs b/src/Perspex.Controls/Button.cs
index 50a4871837..41736206c9 100644
--- a/src/Perspex.Controls/Button.cs
+++ b/src/Perspex.Controls/Button.cs
@@ -44,6 +44,9 @@ namespace Perspex.Controls
         public static readonly PerspexProperty<ICommand> CommandProperty =
             PerspexProperty.Register<Button, ICommand>(nameof(Command));
 
+        public static readonly PerspexProperty<KeyGesture> HotKeyProperty =
+            HotKeyManager.HotKeyProperty.AddOwner<Button>();
+
         /// <summary>
         /// Defines the <see cref="CommandParameter"/> property.
         /// </summary>
@@ -100,6 +103,15 @@ namespace Perspex.Controls
             set { SetValue(CommandProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets an <see cref="KeyGesture"/> associated with this control
+        /// </summary>
+        public KeyGesture HotKey
+        {
+            get { return GetValue(HotKeyProperty); }
+            set { SetValue(HotKeyProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets a parameter to be passed to the <see cref="Command"/>.
         /// </summary>
diff --git a/src/Perspex.Controls/MenuItem.cs b/src/Perspex.Controls/MenuItem.cs
index 99bb5cad01..0acc7ae20f 100644
--- a/src/Perspex.Controls/MenuItem.cs
+++ b/src/Perspex.Controls/MenuItem.cs
@@ -28,6 +28,9 @@ namespace Perspex.Controls
         public static readonly PerspexProperty<ICommand> CommandProperty =
             Button.CommandProperty.AddOwner<MenuItem>();
 
+        public static readonly PerspexProperty<KeyGesture> HotKeyProperty =
+            HotKeyManager.HotKeyProperty.AddOwner<Button>();
+
         /// <summary>
         /// Defines the <see cref="CommandParameter"/> property.
         /// </summary>
@@ -130,6 +133,16 @@ namespace Perspex.Controls
             set { SetValue(CommandProperty, value); }
         }
 
+
+        /// <summary>
+        /// Gets or sets an <see cref="KeyGesture"/> associated with this control
+        /// </summary>
+        public KeyGesture HotKey
+        {
+            get { return GetValue(HotKeyProperty); }
+            set { SetValue(HotKeyProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the parameter to pass to the <see cref="Command"/> property of a
         /// <see cref="MenuItem"/>.
diff --git a/src/Perspex.Input/HotkeyManager.cs b/src/Perspex.Input/HotkeyManager.cs
deleted file mode 100644
index c79b7e280f..0000000000
--- a/src/Perspex.Input/HotkeyManager.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Perspex.Input
-{
-    public class HotkeyManager
-    {
-        public static PerspexProperty<KeyGesture> HotKey
-            = PerspexProperty.RegisterAttached<Visual, KeyGesture>("HotKey", typeof (HotkeyManager));
-
-        class HotkeyCommandWrapper : ICommand
-        {
-            public Visual Visual;
-            public PerspexProperty Property;
-
-            ICommand GetCommand() => (ICommand) Visual.GetValue(Property);
-
-            public bool CanExecute(object parameter) => GetCommand()?.CanExecute(parameter) ?? false;
-
-            public void Execute(object parameter) => GetCommand()?.Execute(parameter);
-
-            //Implementation isn't needed in this case
-            public event EventHandler CanExecuteChanged;
-        }
-
-
-        static HotkeyManager()
-        {
-            HotKey.Changed.Subscribe(args =>
-            {
-                if (args.OldValue != null)
-                {
-                    
-                }
-
-
-            });
-        }
-
-    }
-}
diff --git a/src/Perspex.Input/Perspex.Input.csproj b/src/Perspex.Input/Perspex.Input.csproj
index b3727b3d85..c853ea9bb1 100644
--- a/src/Perspex.Input/Perspex.Input.csproj
+++ b/src/Perspex.Input/Perspex.Input.csproj
@@ -66,7 +66,6 @@
     </Compile>
     <Compile Include="Cursors.cs" />
     <Compile Include="AccessKeyHandler.cs" />
-    <Compile Include="HotkeyManager.cs" />
     <Compile Include="KeyBinding.cs" />
     <Compile Include="KeyGesture.cs" />
     <Compile Include="Platform\IClipboard.cs" />