diff --git a/src/evalfunc.c b/src/evalfunc.c
index b6f05b1..0095661 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4240,6 +4240,13 @@
 	xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
     }
 # endif
+#ifdef FEAT_CSCOPE
+    if (xpc.xp_context == EXPAND_CSCOPE)
+    {
+	set_context_in_cscope_cmd(&xpc, xpc.xp_pattern, CMD_cscope);
+	xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
+    }
+#endif
 
     pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
     if ((rettv_list_alloc(rettv) != FAIL) && (pat != NULL))
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index c6d416f..12194cd 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -125,12 +125,22 @@
   let l = getcompletion('dark', 'highlight')
   call assert_equal([], l)
 
+  if has('cscope')
+    let l = getcompletion('', 'cscope')
+    let cmds = ['add', 'find', 'help', 'kill', 'reset', 'show']
+    call assert_equal(cmds, l)
+    " using cmdline completion must not change the result
+    call feedkeys(":cscope find \<c-d>\<c-c>", 'xt')
+    let l = getcompletion('', 'cscope')
+    call assert_equal(cmds, l)
+    let keys = ['a', 'c', 'd', 'e', 'f', 'g', 'i', 's', 't']
+    let l = getcompletion('find ', 'cscope')
+    call assert_equal(keys, l)
+  endif
+
   " For others test if the name is recognized.
   let names = ['buffer', 'environment', 'file_in_path',
 	\ 'mapping', 'shellcmd', 'tag', 'tag_listfiles', 'user']
-  if has('cscope')
-    call add(names, 'cscope')
-  endif
   if has('cmdline_hist')
     call add(names, 'history')
   endif
diff --git a/src/version.c b/src/version.c
index c5511be..31aa1e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2158,
+/**/
     2157,
 /**/
     2156,