diff --git a/src/misc2.c b/src/misc2.c
index 45070d7..47b3c72 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3253,7 +3253,11 @@
 
 	if (cmd == NULL || *p_sxq == NUL
 #if defined(FEAT_GUI_MSWIN) && defined(FEAT_TERMINAL)
-		|| vim_strchr(p_go, GO_TERMINAL) != NULL
+		|| (
+# ifdef VIMDLL
+		    gui.in_use &&
+# endif
+		    vim_strchr(p_go, GO_TERMINAL) != NULL)
 #endif
 		)
 	    retval = mch_call_shell(cmd, opt);
diff --git a/src/version.c b/src/version.c
index 6635610..b0dcd3b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1500,
+/**/
     1499,
 /**/
     1498,