diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 9c55de3..f38bdac 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2484,11 +2484,6 @@
     int		did_inc_redrawing_disabled = FALSE;
     long        *so_ptr = curwin->w_p_so >= 0 ? &curwin->w_p_so : &p_so;
 
-#ifdef FEAT_PROP_POPUP
-    if (ERROR_IF_TERM_POPUP_WINDOW)
-	return FAIL;
-#endif
-
     if (eap != NULL)
 	command = eap->do_ecmd_cmd;
     set_bufref(&old_curbuf, curbuf);
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();
diff --git a/src/version.c b/src/version.c
index bd5337b..aa88847 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    745,
+/**/
     744,
 /**/
     743,