diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go
index 0a1cd0c5b..b34200e16 100644
--- a/pkg/gui/confirmation_panel.go
+++ b/pkg/gui/confirmation_panel.go
@@ -57,7 +57,7 @@ func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, prompt string) (int
 }
 
 func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, handleConfirm func(*gocui.Gui, *gocui.View) error) error {
-	g.SetViewOnBottom("commitMessage")
+	gui.onNewPopupPanel()
 	// only need to fit one line
 	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, "")
 	if confirmationView, err := g.SetView("confirmation", x0, y0, x1, y1, 0); err != nil {
@@ -73,13 +73,17 @@ func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title s
 	return nil
 }
 
+func (gui *Gui) onNewPopupPanel() {
+	gui.g.SetViewOnBottom("commitMessage")
+}
+
 func (gui *Gui) createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, title, prompt string, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
-	g.SetViewOnBottom("commitMessage")
+	gui.onNewPopupPanel()
 	g.Update(func(g *gocui.Gui) error {
 		// delete the existing confirmation panel if it exists
 		if view, _ := g.View("confirmation"); view != nil {
 			if err := gui.closeConfirmationPrompt(g); err != nil {
-				panic(err)
+				gui.Log.Error("Could not close confirmation prompt: ", err.Error())
 			}
 		}
 		x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, prompt)
diff --git a/test/repos/gpg.sh b/test/repos/gpg.sh
index 94e0742e5..719c6467b 100755
--- a/test/repos/gpg.sh
+++ b/test/repos/gpg.sh
@@ -6,6 +6,8 @@ git init
 git config gpg.program $(which gpg)
 git config user.signingkey E304229F # test key
 git config commit.gpgsign true
+git config credential.helper store
+git config credential.helper cache 1
 
 touch foo
 git add foo