diff --git a/pkg/gui/controllers/helpers/confirmation_helper.go b/pkg/gui/controllers/helpers/confirmation_helper.go
index 49926b155..3ffdae6a1 100644
--- a/pkg/gui/controllers/helpers/confirmation_helper.go
+++ b/pkg/gui/controllers/helpers/confirmation_helper.go
@@ -183,7 +183,7 @@ func runeForMask(mask bool) rune {
 	return 0
 }
 
-func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts types.CreatePopupPanelOpts) error {
+func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts types.CreatePopupPanelOpts) {
 	self.c.Mutexes().PopupMutex.Lock()
 	defer self.c.Mutexes().PopupMutex.Unlock()
 
@@ -197,7 +197,7 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
 	if currentPopupOpts != nil && !currentPopupOpts.HasLoader {
 		self.c.Log.Error("ignoring create popup panel because a popup panel is already open")
 		cancel()
-		return nil
+		return
 	}
 
 	// remove any previous keybindings
@@ -231,7 +231,6 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
 	self.c.State().GetRepoState().SetCurrentPopupOpts(&opts)
 
 	self.c.Context().Push(self.c.Contexts().Confirmation)
-	return nil
 }
 
 func underlineLinks(text string) string {
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index ed51ecd84..643cd00ee 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -671,8 +671,8 @@ func NewGui(
 
 	gui.PopupHandler = popup.NewPopupHandler(
 		cmn,
-		func(ctx goContext.Context, opts types.CreatePopupPanelOpts) error {
-			return gui.helpers.Confirmation.CreatePopupPanel(ctx, opts)
+		func(ctx goContext.Context, opts types.CreatePopupPanelOpts) {
+			gui.helpers.Confirmation.CreatePopupPanel(ctx, opts)
 		},
 		func() error { return gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) },
 		func() { gui.State.ContextMgr.Pop() },
diff --git a/pkg/gui/popup/popup_handler.go b/pkg/gui/popup/popup_handler.go
index f11d4fe3c..c5d9f9e1a 100644
--- a/pkg/gui/popup/popup_handler.go
+++ b/pkg/gui/popup/popup_handler.go
@@ -12,7 +12,7 @@ import (
 
 type PopupHandler struct {
 	*common.Common
-	createPopupPanelFn      func(context.Context, types.CreatePopupPanelOpts) error
+	createPopupPanelFn      func(context.Context, types.CreatePopupPanelOpts)
 	onErrorFn               func() error
 	popContextFn            func()
 	currentContextFn        func() types.Context
@@ -28,7 +28,7 @@ var _ types.IPopupHandler = &PopupHandler{}
 
 func NewPopupHandler(
 	common *common.Common,
-	createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts) error,
+	createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts),
 	onErrorFn func() error,
 	popContextFn func(),
 	currentContextFn func() types.Context,
@@ -94,16 +94,17 @@ func (self *PopupHandler) Alert(title string, message string) error {
 }
 
 func (self *PopupHandler) Confirm(opts types.ConfirmOpts) error {
-	return self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
+	self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
 		Title:         opts.Title,
 		Prompt:        opts.Prompt,
 		HandleConfirm: opts.HandleConfirm,
 		HandleClose:   opts.HandleClose,
 	})
+	return nil
 }
 
 func (self *PopupHandler) Prompt(opts types.PromptOpts) error {
-	return self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
+	self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
 		Title:                  opts.Title,
 		Prompt:                 opts.InitialContent,
 		Editable:               true,
@@ -114,6 +115,7 @@ func (self *PopupHandler) Prompt(opts types.PromptOpts) error {
 		AllowEditSuggestion:    opts.AllowEditSuggestion,
 		Mask:                   opts.Mask,
 	})
+	return nil
 }
 
 // returns the content that has currently been typed into the prompt. Useful for