From 262ff24c5bccd02f18f6ac058de44e24cca00d0a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 23 Aug 2020 13:44:11 +1000
Subject: [PATCH] always reset branch selected index when creating new branch

---
 pkg/gui/branches_panel.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index 36c8ab112..e81dbc68a 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -226,6 +226,7 @@ func (gui *Gui) createNewBranchWithName(newBranchName string) error {
 	if err := gui.GitCommand.NewBranch(newBranchName, branch.Name); err != nil {
 		return gui.surfaceError(err)
 	}
+
 	gui.State.Panels.Branches.SelectedLineIdx = 0
 	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
 }
@@ -482,9 +483,10 @@ func (gui *Gui) handleNewBranchOffCurrentItem() error {
 			if err := gui.switchContext(gui.Contexts.Branches.Context); err != nil {
 				return err
 			}
-			gui.State.Panels.Branches.SelectedLineIdx = 0
 		}
 
+		gui.State.Panels.Branches.SelectedLineIdx = 0
+
 		return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
 	})
 }