1 files changed, 10 insertions, 7 deletions
diff --git a/gui.go b/gui.go
index 033dbe06a..589dabea3 100644
--- a/gui.go
+++ b/gui.go
@@ -216,13 +216,6 @@ func layout(g *gocui.Gui) error {
 		}
 	}
 
-	if err = resizeConfirmationPanel(g, "commitMessage"); err != nil {
-		return err
-	}
-	if err = resizeConfirmationPanel(g, "confirmation"); err != nil {
-		return err
-	}
-
 	if v, err := g.SetView("version", width-len(version)-1, optionsTop, width, optionsTop+2, 0); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
@@ -241,6 +234,8 @@ func layout(g *gocui.Gui) error {
 		nextView(g, nil)
 	}
 
+	resizePopupPanels(g)
+
 	return nil
 }
 
@@ -269,6 +264,14 @@ func goEvery(g *gocui.Gui, interval time.Duration, function func(*gocui.Gui) err
 	}()
 }
 
+func resizePopupPanels(g *gocui.Gui) error {
+	v := g.CurrentView()
+	if v.Name() == "commitMessage" || v.Name() == "confirmation" {
+		return resizePopupPanel(g, v)
+	}
+	return nil
+}
+
 func run() (err error) {
 	g, err := gocui.NewGui(gocui.OutputNormal, OverlappingEdges)
 	if err != nil {