diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 4d23f4a..b700c82 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1009,9 +1009,6 @@
 The `mode()` function will return the state as it will be after applying the
 operator.
 
-The `mode()` function will return the state as it will be after applying the
-operator.
-
 Here is an example for using a lambda function to create a normal-mode
 operator to add quotes around text in the current line: >
 
diff --git a/src/os_unix.c b/src/os_unix.c
index 0b2b572..fa9c5f3 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6691,10 +6691,17 @@
     }
     else
     {
-	if (flags & EW_NOTFOUND)
-	    STRCPY(command, "set nonomatch; ");
-	else
-	    STRCPY(command, "unset nonomatch; ");
+	STRCPY(command, "");
+	if (shell_style == STYLE_GLOB)
+	{
+	    // Assume the nonomatch option is valid only for csh like shells,
+	    // otherwise, this may set the positional parameters for the shell,
+	    // e.g. "$*".
+	    if (flags & EW_NOTFOUND)
+		STRCAT(command, "set nonomatch; ");
+	    else
+		STRCAT(command, "unset nonomatch; ");
+	}
 	if (shell_style == STYLE_GLOB)
 	    STRCAT(command, "glob >");
 	else if (shell_style == STYLE_PRINT)
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
index 8606223..e68d55e 100644
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -1,6 +1,7 @@
 " Test for expanding file names
 
 source shared.vim
+source check.vim
 
 func Test_with_directories()
   call mkdir('Xdir1')
@@ -135,4 +136,9 @@
   %bwipe!
 endfunc
 
+func Test_expandcmd_shell_nonomatch()
+  CheckNotMSWindows
+  call assert_equal('$*', expandcmd('$*'))
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 94238de..919a802 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3623,
+/**/
     3622,
 /**/
     3621,