diff --git a/pkg/gui/controllers/custom_patch_options_menu_action.go b/pkg/gui/controllers/custom_patch_options_menu_action.go
index 3adedfc1b..a8feed168 100644
--- a/pkg/gui/controllers/custom_patch_options_menu_action.go
+++ b/pkg/gui/controllers/custom_patch_options_menu_action.go
@@ -18,6 +18,10 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
 		return self.c.ErrorMsg(self.c.Tr.NoPatchError)
 	}
 
+	if self.c.Git().Patch.PatchBuilder.IsEmpty() {
+		return self.c.ErrorMsg(self.c.Tr.EmptyPatchError)
+	}
+
 	menuItems := []*types.MenuItem{
 		{
 			Label:   self.c.Tr.ResetPatch,
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 97522da54..735ac3cf4 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -323,6 +323,7 @@ type TranslationSet struct {
 	ViewPatchOptions                    string
 	PatchOptionsTitle                   string
 	NoPatchError                        string
+	EmptyPatchError                     string
 	EnterFile                           string
 	ExitCustomPatchBuilder              string
 	EnterUpstream                       string
@@ -1017,6 +1018,7 @@ func EnglishTranslationSet() TranslationSet {
 		ViewPatchOptions:                    "View custom patch options",
 		PatchOptionsTitle:                   "Patch options",
 		NoPatchError:                        "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines",
+		EmptyPatchError:                     "Patch is still empty. Add some files or lines to your patch first.",
 		EnterFile:                           "Enter file to add selected lines to the patch (or toggle directory collapsed)",
 		ExitCustomPatchBuilder:              `Exit custom patch builder`,
 		EnterUpstream:                       `Enter upstream as '<remote> <branchname>'`,