diff --git a/src/evalfunc.c b/src/evalfunc.c
index 0e6d759..d3ef15e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -1822,7 +1822,11 @@
     {
 	name = get_user_func_name(xp, idx);
 	if (name != NULL)
+	{
+	    if (*name != '<' && STRNCMP("g:", xp->xp_pattern, 2) == 0)
+		return cat_prefix_varname('g', name);
 	    return name;
+	}
     }
     if (++intidx < (int)(sizeof(global_functions) / sizeof(funcentry_T)))
     {
diff --git a/src/evalvars.c b/src/evalvars.c
index 644190f..155f603 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1952,7 +1952,7 @@
 /*
  * Function to concatenate a prefix and a variable name.
  */
-    static char_u *
+    char_u *
 cat_prefix_varname(int prefix, char_u *name)
 {
     int		len;
diff --git a/src/proto/evalvars.pro b/src/proto/evalvars.pro
index c597ca3..0861a88 100644
--- a/src/proto/evalvars.pro
+++ b/src/proto/evalvars.pro
@@ -26,6 +26,7 @@
 int do_unlet(char_u *name, int forceit);
 void item_lock(typval_T *tv, int deep, int lock, int check_refcount);
 void del_menutrans_vars(void);
+char_u *cat_prefix_varname(int prefix, char_u *name);
 char_u *get_user_var_name(expand_T *xp, int idx);
 char *get_var_special_name(int nr);
 dict_T *get_globvar_dict(void);
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 2a6db7d..cb16de1 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -619,6 +619,10 @@
   call assert_match('"func Test_cmdline_complete_user', @:)
   call feedkeys(":func s:ScriptL\<Tab>\<Home>\"\<cr>", 'tx')
   call assert_match('"func <SNR>\d\+_ScriptLocalFunction', @:)
+
+  " g: prefix also works
+  call feedkeys(":echo g:Test_cmdline_complete_user_f\<Tab>\<Home>\"\<cr>", 'tx')
+  call assert_match('"echo g:Test_cmdline_complete_user_func', @:)
 endfunc
 
 func Test_cmdline_complete_user_names()
diff --git a/src/version.c b/src/version.c
index 24462a0..78b805f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2341,
+/**/
     2340,
 /**/
     2339,