diff --git a/src/Views/Controls/Tree.cs b/src/Views/Controls/Tree.cs
index 4d4a257a..cb2288bb 100644
--- a/src/Views/Controls/Tree.cs
+++ b/src/Views/Controls/Tree.cs
@@ -48,12 +48,7 @@ namespace SourceGit.Views.Controls {
         public List<object> Selected {
             get;
             set;
-        }
-
-        public Tree() {
-            Selected = new List<object>();
-            PreviewMouseDown += OnPreviewMouseDown;
-        }
+        } = new List<object>();
 
         public TreeItem FindItem(DependencyObject elem) {
             if (elem == null) return null;
@@ -102,21 +97,18 @@ namespace SourceGit.Views.Controls {
             }
         }
 
-        private TreeItem FindItemByDataContext(ItemsControl control, object data) {
-            if (control == null) return null;
+        protected override void OnPreviewKeyDown(KeyEventArgs e) {
+            base.OnPreviewKeyDown(e);
 
-            for (int i = 0; i < control.Items.Count; i++) {
-                var child = control.ItemContainerGenerator.ContainerFromIndex(i) as TreeItem;
-                if (control.Items[i] == data) return child;
-
-                var found = FindItemByDataContext(child, data);
-                if (found != null) return found;
+            if (MultiSelection && e.Key == Key.A && Keyboard.Modifiers == ModifierKeys.Control) {
+                SelectAll();
+                e.Handled = true;
             }
-
-            return null;
         }
 
-        private void OnPreviewMouseDown(object sender, MouseButtonEventArgs e) {
+        protected override void OnPreviewMouseDown(MouseButtonEventArgs e) {
+            base.OnPreviewMouseDown(e);
+
             var hit = VisualTreeHelper.HitTest(this, e.GetPosition(this));
             if (hit == null || hit.VisualHit == null) return;
 
@@ -157,6 +149,20 @@ namespace SourceGit.Views.Controls {
             }
         }
 
+        private TreeItem FindItemByDataContext(ItemsControl control, object data) {
+            if (control == null) return null;
+
+            for (int i = 0; i < control.Items.Count; i++) {
+                var child = control.ItemContainerGenerator.ContainerFromIndex(i) as TreeItem;
+                if (control.Items[i] == data) return child;
+
+                var found = FindItemByDataContext(child, data);
+                if (found != null) return found;
+            }
+
+            return null;
+        }
+
         private void AddSelected(TreeItem item, bool removeOthers) {
             if (removeOthers && Selected.Count > 0) {
                 UnselectAllChildren(this);
diff --git a/src/Views/Widgets/WorkingCopyChanges.xaml b/src/Views/Widgets/WorkingCopyChanges.xaml
index a3a7f131..86c328c8 100644
--- a/src/Views/Widgets/WorkingCopyChanges.xaml
+++ b/src/Views/Widgets/WorkingCopyChanges.xaml
@@ -25,22 +25,8 @@
             MultiSelection="True"
             ItemsSource="{Binding ElementName=me, Path=Nodes}"
             SelectionChanged="OnTreeSelectionChanged"
+            PreviewKeyDown="OnChangePreviewKeyDown"
             Visibility="Visible">
-            <TreeView.Resources>
-                <RoutedUICommand x:Key="SelectWholeTreeCommand" Text="SelectWholeTree"/>
-                <RoutedUICommand x:Key="StageChangeCommand" Text="StageChange"/>
-            </TreeView.Resources>
-
-            <TreeView.InputBindings>
-                <KeyBinding Key="A" Modifiers="Ctrl" Command="{StaticResource SelectWholeTreeCommand}"/>
-                <KeyBinding Key="Space" Command="{StaticResource StageChangeCommand}"/>
-            </TreeView.InputBindings>
-
-            <TreeView.CommandBindings>
-                <CommandBinding Command="{StaticResource SelectWholeTreeCommand}" Executed="SelectWholeTree"/>
-                <CommandBinding Command="{StaticResource StageChangeCommand}" Executed="StageChange"/>
-            </TreeView.CommandBindings>
-            
             <controls:Tree.ItemContainerStyle>
                 <Style TargetType="{x:Type controls:TreeItem}" BasedOn="{StaticResource Style.TreeItem}">
                     <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
@@ -95,6 +81,7 @@
             SelectionUnit="FullRow"
             SelectionChanged="OnListSelectionChanged"
             SizeChanged="OnListSizeChanged"
+            PreviewKeyDown="OnChangePreviewKeyDown"
             ItemsSource="{Binding ElementName=me, Path=Changes}"
             RowStyle="{StaticResource Style.DataGridRow.Change}"
             Visibility="Collapsed">
@@ -123,6 +110,7 @@
             SelectionUnit="FullRow"
             SelectionChanged="OnGridSelectionChanged"
             SizeChanged="OnGridSizeChanged"
+            PreviewKeyDown="OnChangePreviewKeyDown"
             ItemsSource="{Binding ElementName=me, Path=Changes}"
             RowStyle="{StaticResource Style.DataGridRow.Change}"
             Visibility="Collapsed">
diff --git a/src/Views/Widgets/WorkingCopyChanges.xaml.cs b/src/Views/Widgets/WorkingCopyChanges.xaml.cs
index 936fcfb0..8e66f8ec 100644
--- a/src/Views/Widgets/WorkingCopyChanges.xaml.cs
+++ b/src/Views/Widgets/WorkingCopyChanges.xaml.cs
@@ -686,15 +686,15 @@ namespace SourceGit.Views.Widgets {
         #endregion
 
         #region EVENTS
-        private void SelectWholeTree(object sender, ExecutedRoutedEventArgs e) {
-            modeTree.SelectAll();
-        }
-        
-        private void StageChange(object sender, ExecutedRoutedEventArgs e) {
-            if (!IsUnstaged) {
-                UnstageSelected();
-            } else {
-                StageSelected();
+        private void OnChangePreviewKeyDown(object sender, KeyEventArgs e) {
+            if (e.Key == Key.Space && Keyboard.Modifiers == ModifierKeys.None) {
+                if (!IsUnstaged) {
+                    UnstageSelected();
+                } else {
+                    StageSelected();
+                }
+
+                e.Handled = true;
             }
         }