clean up interface for popup panels

1 files changed, 11 insertions, 5 deletions

diff --git a/pkg/gui/filtering.go b/pkg/gui/filtering.go
index 66232e3fb..3acb3c34a 100644
--- a/pkg/gui/filtering.go
+++ b/pkg/gui/filtering.go
@@ -1,16 +1,22 @@
 package gui
 
-import "github.com/jesseduffield/gocui"
-
 func (gui *Gui) inFilterMode() bool {
 	return gui.State.FilterPath != ""
 }
 
 func (gui *Gui) validateNotInFilterMode() (bool, error) {
 	if gui.inFilterMode() {
-		return false, gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("MustExitFilterModeTitle"), gui.Tr.SLocalize("MustExitFilterModePrompt"), func(*gocui.Gui, *gocui.View) error {
-			return gui.exitFilterMode()
-		}, nil)
+		err := gui.createConfirmationPanel(createConfirmationPanelOpts{
+			returnToView:       gui.g.CurrentView(),
+			returnFocusOnClose: true,
+			title:              gui.Tr.SLocalize("MustExitFilterModeTitle"),
+			prompt:             gui.Tr.SLocalize("MustExitFilterModePrompt"),
+			handleConfirm: func() error {
+				return gui.exitFilterMode()
+			},
+		})
+
+		return false, err
 	}
 	return true, nil
 }