diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go
index 626fe173c..287410ba9 100644
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -291,6 +291,9 @@ func (gui *Gui) handleToggleCommitFileTreeView() error {
 		if err := gui.Contexts.CommitFiles.HandleRender(); err != nil {
 			return err
 		}
+		if err := gui.Contexts.CommitFiles.HandleFocus(); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index d95875d5e..5a7ee6c66 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -868,6 +868,9 @@ func (gui *Gui) handleToggleFileTreeView() error {
 		if err := gui.Contexts.Files.HandleRender(); err != nil {
 			return err
 		}
+		if err := gui.Contexts.Files.HandleFocus(); err != nil {
+			return err
+		}
 	}
 
 	return nil