Merge pull request #2551 from stefanhaller/fix-initial-context-activationv0.38.0

3 files changed, 6 insertions, 1 deletions

diff --git a/pkg/gui/gui_common.go b/pkg/gui/gui_common.go
index 7c306a0d5..c5ed5e1bf 100644
--- a/pkg/gui/gui_common.go
+++ b/pkg/gui/gui_common.go
@@ -74,6 +74,10 @@ func (self *guiCommon) IsCurrentContext(c types.Context) bool {
 	return self.CurrentContext().GetKey() == c.GetKey()
 }
 
+func (self *guiCommon) ActivateContext(context types.Context) error {
+	return self.gui.activateContext(context, types.OnFocusOpts{})
+}
+
 func (self *guiCommon) GetAppState() *config.AppState {
 	return self.gui.Config.GetAppState()
 }
diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go
index 0deb37d2e..14e1973bc 100644
--- a/pkg/gui/layout.go
+++ b/pkg/gui/layout.go
@@ -182,7 +182,7 @@ func (gui *Gui) onInitialViewsCreationForRepo() error {
 	}
 
 	initialContext := gui.currentSideContext()
-	if err := gui.c.PushContext(initialContext); err != nil {
+	if err := gui.c.ActivateContext(initialContext); err != nil {
 		return err
 	}
 
diff --git a/pkg/gui/types/common.go b/pkg/gui/types/common.go
index fc6b26989..0b563f014 100644
--- a/pkg/gui/types/common.go
+++ b/pkg/gui/types/common.go
@@ -49,6 +49,7 @@ type IGuiCommon interface {
 	CurrentContext() Context
 	CurrentStaticContext() Context
 	IsCurrentContext(Context) bool
+	ActivateContext(context Context) error
 	// enters search mode for the current view
 	OpenSearch()