diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index be8b76c5..8dcf190a 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -636,6 +636,7 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
 	/* we're completing -option? */
 	if (*word == '-') {
 		*list = completion_get_options(cmd, word+1);
+		if (*list != NULL) signal_stop();
 		g_free(cmd);
 		g_free(line);
 		return;
@@ -651,9 +652,9 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
 		cmd = g_strconcat(line, " ", word, NULL);
 		*list = g_list_concat(completion_get_subcommands(cmd), *list);
 
-		if (*list != NULL) signal_stop();
 	}
 
+	if (*list != NULL) signal_stop();
 	g_free(signal);
 	g_free(cmd);