diff --git a/pkg/gui/patch_building_panel.go b/pkg/gui/patch_building_panel.go
index 984ac80ce..7f741a7b0 100644
--- a/pkg/gui/patch_building_panel.go
+++ b/pkg/gui/patch_building_panel.go
@@ -102,9 +102,10 @@ func (gui *Gui) handleEscapePatchBuildingPanel() error {
 
 	if gui.currentContext().GetKey() == gui.Contexts.PatchBuilding.Context.GetKey() {
 		return gui.switchContext(gui.Contexts.CommitFiles.Context)
+	} else {
+		// need to re-focus in case the secondary view should now be hidden
+		return gui.currentContext().HandleFocus()
 	}
-
-	return nil
 }
 
 func (gui *Gui) secondaryPatchPanelUpdateOpts() *viewUpdateOpts {