1 files changed, 4 insertions, 42 deletions
diff --git a/pkg/gui/context.go b/pkg/gui/context.go
index 38bf7c225..fd8877ba0 100644
--- a/pkg/gui/context.go
+++ b/pkg/gui/context.go
@@ -1,44 +1,5 @@
 package gui
 
-func (gui *Gui) titleMap() map[string]string {
-	return map[string]string{
-		"commits":  gui.Tr.SLocalize("DiffTitle"),
-		"branches": gui.Tr.SLocalize("LogTitle"),
-		"files":    gui.Tr.SLocalize("DiffTitle"),
-		"status":   "",
-		"stash":    gui.Tr.SLocalize("DiffTitle"),
-	}
-}
-
-func (gui *Gui) contextTitleMap() map[string]map[string]string {
-	return map[string]map[string]string{
-		"main": {
-			"staging":        gui.Tr.SLocalize("StagingMainTitle"),
-			"patch-building": gui.Tr.SLocalize("PatchBuildingMainTitle"),
-			"merging":        gui.Tr.SLocalize("MergingMainTitle"),
-			"normal":         "",
-		},
-	}
-}
-
-func (gui *Gui) setMainTitle() error {
-	currentView := gui.g.CurrentView()
-	if currentView == nil {
-		return nil
-	}
-	currentViewName := currentView.Name()
-	var newTitle string
-	if context, ok := gui.State.Contexts[currentViewName]; ok {
-		newTitle = gui.contextTitleMap()[currentViewName][context]
-	} else if title, ok := gui.titleMap()[currentViewName]; ok {
-		newTitle = title
-	} else {
-		return nil
-	}
-	gui.getMainView().Title = newTitle
-	return nil
-}
-
 func (gui *Gui) changeContext(viewName, context string) error {
 	if gui.State.Contexts[viewName] == context {
 		return nil
@@ -50,19 +11,20 @@ func (gui *Gui) changeContext(viewName, context string) error {
 
 	bindings := contextMap[viewName][context]
 	for _, binding := range bindings {
-		if err := gui.g.SetKeybinding(viewName, binding.Key, binding.Modifier, binding.Handler); err != nil {
+		if err := gui.g.SetKeybinding(binding.ViewName, binding.Key, binding.Modifier, binding.Handler); err != nil {
 			return err
 		}
 	}
 	gui.State.Contexts[viewName] = context
-	return gui.setMainTitle()
+	return nil
 }
 
 func (gui *Gui) setInitialContexts() error {
 	contextMap := gui.GetContextMap()
 
 	initialContexts := map[string]string{
-		"main": "normal",
+		"main":      "normal",
+		"secondary": "normal",
 	}
 
 	for viewName, context := range initialContexts {