diff --git a/pkg/gui/context.go b/pkg/gui/context.go
index 29f8be47e..c84e604b8 100644
--- a/pkg/gui/context.go
+++ b/pkg/gui/context.go
@@ -32,7 +32,7 @@ const (
 	MENU_CONTEXT_KEY                = "menu"
 	CREDENTIALS_CONTEXT_KEY         = "credentials"
 	CONFIRMATION_CONTEXT_KEY        = "confirmation"
-	SEARCH_CONTEXT_KEY              = "confirmation"
+	SEARCH_CONTEXT_KEY              = "search"
 	COMMIT_MESSAGE_CONTEXT_KEY      = "commitMessage"
 )
 
diff --git a/pkg/gui/custom_commands.go b/pkg/gui/custom_commands.go
index 190fc5586..7181ec2e2 100644
--- a/pkg/gui/custom_commands.go
+++ b/pkg/gui/custom_commands.go
@@ -20,7 +20,7 @@ type CustomCommandObjects struct {
 	SelectedTag          *commands.Tag
 	SelectedStashEntry   *commands.StashEntry
 	SelectedCommitFile   *commands.CommitFile
-	CurrentBranch        *commands.Branch
+	CheckedOutBranch     *commands.Branch
 }
 
 func (gui *Gui) handleCustomCommandKeybinding(customCommand CustomCommand) func() error {
@@ -36,7 +36,7 @@ func (gui *Gui) handleCustomCommandKeybinding(customCommand CustomCommand) func(
 			SelectedStashEntry:   gui.getSelectedStashEntry(),
 			SelectedCommitFile:   gui.getSelectedCommitFile(),
 			SelectedSubCommit:    gui.getSelectedSubCommit(),
-			CurrentBranch:        gui.currentBranch(),
+			CheckedOutBranch:     gui.currentBranch(),
 		}
 
 		tmpl, err := template.New("custom command template").Parse(customCommand.Command)