1 files changed, 9 insertions, 4 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go
index d34733591..ae0db7d0f 100644
--- a/pkg/gui/rebase_options_panel.go
+++ b/pkg/gui/rebase_options_panel.go
@@ -78,13 +78,18 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error {
 		// assume in this case that we're already done
 		return nil
 	} else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") {
-		return gui.createConfirmationPanel(gui.g, gui.getFilesView(), true, gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"),
-			func(g *gocui.Gui, v *gocui.View) error {
+		return gui.createConfirmationPanel(createConfirmationPanelOpts{
+			returnToView:       gui.getFilesView(),
+			returnFocusOnClose: true,
+			title:              gui.Tr.SLocalize("FoundConflictsTitle"),
+			prompt:             gui.Tr.SLocalize("FoundConflicts"),
+			handleConfirm: func() error {
 				return nil
-			}, func(g *gocui.Gui, v *gocui.View) error {
+			},
+			handleClose: func() error {
 				return gui.genericMergeCommand("abort")
 			},
-		)
+		})
 	} else {
 		return gui.createErrorPanel(result.Error())
 	}