diff --git a/src/misc2.c b/src/misc2.c
index db03b5b..0ab6caf 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1069,6 +1069,14 @@
 # if defined(FEAT_BEVAL_TERM)
     ui_remove_balloon();
 # endif
+# if defined(FEAT_PROP_POPUP)
+    if (curwin != NULL)
+    {
+	while (popup_is_popup(curwin))
+	    popup_close_with_retval(curwin, 0);
+	close_all_popups();
+    }
+# endif
 
     // Clear user commands (before deleting buffers).
     ex_comclear(NULL);
@@ -3144,8 +3152,7 @@
     if (p_verbose > 3)
     {
 	verbose_enter();
-	smsg(_("Calling shell to execute: \"%s\""),
-						    cmd == NULL ? p_sh : cmd);
+	smsg(_("Calling shell to execute: \"%s\""), cmd == NULL ? p_sh : cmd);
 	out_char('\n');
 	cursor_on();
 	verbose_leave();