diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 88b146d7c..b61170b30 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -441,10 +441,6 @@ func (gui *Gui) Run() error {
 
 	g.SetManager(gocui.ManagerFunc(gui.layout), gocui.ManagerFunc(gui.getFocusLayout()))
 
-	if err = gui.keybindings(g); err != nil {
-		return err
-	}
-
 	gui.Log.Warn("starting main loop")
 
 	err = g.MainLoop()
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 4eee9f5c5..9bd27fa0b 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -1540,11 +1540,11 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 	return bindings
 }
 
-func (gui *Gui) keybindings(g *gocui.Gui) error {
+func (gui *Gui) keybindings() error {
 	bindings := gui.GetInitialKeybindings()
 
 	for _, binding := range bindings {
-		if err := g.SetKeybinding(binding.ViewName, binding.Contexts, binding.Key, binding.Modifier, binding.Handler); err != nil {
+		if err := gui.g.SetKeybinding(binding.ViewName, binding.Contexts, binding.Key, binding.Modifier, binding.Handler); err != nil {
 			return err
 		}
 	}
@@ -1555,7 +1555,7 @@ func (gui *Gui) keybindings(g *gocui.Gui) error {
 	}
 
 	for viewName, binding := range tabClickBindings {
-		if err := g.SetTabClickBinding(viewName, binding); err != nil {
+		if err := gui.g.SetTabClickBinding(viewName, binding); err != nil {
 			return err
 		}
 	}
diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go
index 9f97bf4fd..583e50071 100644
--- a/pkg/gui/layout.go
+++ b/pkg/gui/layout.go
@@ -340,6 +340,10 @@ func (gui *Gui) onInitialViewsCreation() error {
 		return err
 	}
 
+	if err := gui.keybindings(); err != nil {
+		return err
+	}
+
 	if gui.showRecentRepos {
 		if err := gui.handleCreateRecentReposMenu(); err != nil {
 			return err