diff --git a/pkg/gui/context.go b/pkg/gui/context.go index 9f097f78a..8d147f4c9 100644 --- a/pkg/gui/context.go +++ b/pkg/gui/context.go @@ -181,7 +181,12 @@ func (gui *Gui) activateContext(c types.Context, opts ...types.OnFocusOpts) erro if err != nil { return err } - originalViewContextKey := gui.State.ViewContextMap.Get(viewName).GetKey() + + originalViewContext := gui.State.ViewContextMap.Get(viewName) + var originalViewContextKey types.ContextKey = "" + if originalViewContext != nil { + originalViewContextKey = originalViewContext.GetKey() + } gui.setWindowContext(c) gui.setViewTabForContext(c)