hide commit files view upon losing focus because you probably don't want it lingering anyway

1 files changed, 8 insertions, 1 deletions

diff --git a/pkg/gui/context.go b/pkg/gui/context.go
index 91ec00fb1..036870a5b 100644
--- a/pkg/gui/context.go
+++ b/pkg/gui/context.go
@@ -485,7 +485,7 @@ func (gui *Gui) returnFromContext() error {
 
 func (gui *Gui) deactivateContext(c Context) error {
 	// if we are the kind of context that is sent to back upon deactivation, we should do that
-	if c.GetKind() == TEMPORARY_POPUP || c.GetKind() == PERSISTENT_POPUP {
+	if c.GetKind() == TEMPORARY_POPUP || c.GetKind() == PERSISTENT_POPUP || c.GetKey() == COMMIT_FILES_CONTEXT_KEY {
 		_, _ = gui.g.SetViewOnBottom(c.GetViewName())
 	}
 
@@ -682,6 +682,13 @@ func (gui *Gui) onViewFocusLost(v *gocui.View, newView *gocui.View) error {
 		}
 	}
 
+	if v.Name() == "commitFiles" && newView.Name() != "main" && newView.Name() != "secondary" {
+		gui.resetWindowForView("commitFiles")
+		if err := gui.deactivateContext(gui.Contexts.CommitFiles.Context); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }