diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index 5898ed73..f364d7e4 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -96,7 +96,6 @@ namespace SourceGit.Views
 
         public ChangeCollectionView()
         {
-            Focusable = true;
             InitializeComponent();
         }
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 0c7e46f5..ebf4b069 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -65,6 +65,7 @@
       <!-- Unstaged Changes -->
       <v:ChangeCollectionView Grid.Row="1"
                               x:Name="UnstagedChangesView"
+                              Focusable="True"
                               IsUnstagedChange="True"
                               SelectionMode="Multiple"
                               Background="{DynamicResource Brush.Contents}"
@@ -100,6 +101,7 @@
       <!-- Staged Changes -->
       <v:ChangeCollectionView Grid.Row="3"
                               x:Name="StagedChangesView"
+                              Focusable="True"
                               SelectionMode="Multiple"
                               Background="{DynamicResource Brush.Contents}"
                               ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=StagedChangeViewMode}"