diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index 805028d0..36de5685 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -30,7 +30,8 @@
 
   <UserControl.DataTemplates>
     <DataTemplate DataType="vm:ChangeCollectionAsTree">
-      <v:ChangeCollectionContainer ItemsSource="{Binding Rows}"
+      <v:ChangeCollectionContainer Focusable="True"
+                                   ItemsSource="{Binding Rows}"
                                    SelectedItems="{Binding SelectedRows, Mode=TwoWay}"
                                    SelectionMode="{Binding #ThisControl.SelectionMode}"
                                    SelectionChanged="OnRowSelectionChanged">
@@ -66,7 +67,8 @@
     </DataTemplate>
 
     <DataTemplate DataType="vm:ChangeCollectionAsGrid">
-      <v:ChangeCollectionContainer ItemsSource="{Binding Changes}"
+      <v:ChangeCollectionContainer Focusable="True"
+                                   ItemsSource="{Binding Changes}"
                                    SelectedItems="{Binding SelectedChanges, Mode=TwoWay}"
                                    SelectionMode="{Binding #ThisControl.SelectionMode}"
                                    SelectionChanged="OnRowSelectionChanged">
@@ -98,7 +100,8 @@
     </DataTemplate>
 
     <DataTemplate DataType="vm:ChangeCollectionAsList">
-      <v:ChangeCollectionContainer ItemsSource="{Binding Changes}"
+      <v:ChangeCollectionContainer Focusable="True"
+                                   ItemsSource="{Binding Changes}"
                                    SelectedItems="{Binding SelectedChanges, Mode=TwoWay}"
                                    SelectionMode="{Binding #ThisControl.SelectionMode}"
                                    SelectionChanged="OnRowSelectionChanged">
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index 6ef79861..00499fce 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -145,6 +145,7 @@ namespace SourceGit.Views
 
                         removeCount++;
                     }
+
                     tree.Rows.RemoveRange(idx + 1, removeCount);
                 }
             }
@@ -209,6 +210,13 @@ namespace SourceGit.Views
             return null;
         }
 
+        public void TakeFocus()
+        {
+            var container = this.FindDescendantOfType<ChangeCollectionContainer>();
+            if (container is { IsFocused: false })
+                container.Focus();
+        }
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index f905f4b5..ee8619f3 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -122,7 +122,6 @@
         <!-- Unstaged Changes -->
         <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="UnstagedChangesView"
-                                Focusable="True"
                                 IsUnstagedChange="True"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
@@ -173,7 +172,6 @@
         <!-- Staged Changes -->
         <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="StagedChangesView"
-                                Focusable="True"
                                 IsUnstagedChange="False"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index c99a0401..ca2ebbb7 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -51,7 +51,7 @@ namespace SourceGit.Views
             {
                 var next = UnstagedChangesView.GetNextChangeWithoutSelection();
                 vm.StageSelected(next);
-                UnstagedChangesView.Focus();
+                UnstagedChangesView.TakeFocus();
                 e.Handled = true;
             }
         }
@@ -62,7 +62,7 @@ namespace SourceGit.Views
             {
                 var next = StagedChangesView.GetNextChangeWithoutSelection();
                 vm.UnstageSelected(next);
-                StagedChangesView.Focus();
+                StagedChangesView.TakeFocus();
                 e.Handled = true;
             }
         }
@@ -75,7 +75,7 @@ namespace SourceGit.Views
                 {
                     var next = UnstagedChangesView.GetNextChangeWithoutSelection();
                     vm.StageSelected(next);
-                    UnstagedChangesView.Focus();
+                    UnstagedChangesView.TakeFocus();
                     e.Handled = true;
                     return;
                 }
@@ -94,7 +94,7 @@ namespace SourceGit.Views
             {
                 var next = StagedChangesView.GetNextChangeWithoutSelection();
                 vm.UnstageSelected(next);
-                StagedChangesView.Focus();
+                StagedChangesView.TakeFocus();
                 e.Handled = true;
             }
         }
@@ -105,7 +105,7 @@ namespace SourceGit.Views
             {
                 var next = UnstagedChangesView.GetNextChangeWithoutSelection();
                 vm.StageSelected(next);
-                UnstagedChangesView.Focus();
+                UnstagedChangesView.TakeFocus();
             }
 
             e.Handled = true;
@@ -117,7 +117,7 @@ namespace SourceGit.Views
             {
                 var next = StagedChangesView.GetNextChangeWithoutSelection();
                 vm.UnstageSelected(next);
-                StagedChangesView.Focus();
+                StagedChangesView.TakeFocus();
             }
 
             e.Handled = true;