diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 4e15af94e..4cf416389 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -64,9 +64,9 @@ type ContextManager struct {
 	sync.RWMutex
 }
 
-func NewContextManager(initialContext types.Context) ContextManager {
+func NewContextManager() ContextManager {
 	return ContextManager{
-		ContextStack: []types.Context{initialContext},
+		ContextStack: []types.Context{},
 		RWMutex:      sync.RWMutex{},
 	}
 }
@@ -299,11 +299,15 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) {
 		},
 		ScreenMode: initialScreenMode,
 		// TODO: put contexts in the context manager
-		ContextManager:    NewContextManager(initialContext),
+		ContextManager:    NewContextManager(),
 		Contexts:          contextTree,
 		WindowViewNameMap: initialWindowViewNameMap,
 	}
 
+	if err := gui.c.PushContext(initialContext); err != nil {
+		gui.c.Log.Error(err)
+	}
+
 	gui.RepoStateMap[Repo(currentDir)] = gui.State
 }