diff --git a/src/evalvars.c b/src/evalvars.c
index a12b9bd..6aa2e42 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1414,7 +1414,7 @@
 		n = (long)tv_get_number(tv);
 	}
 
-	if (opt_p_flags & P_FUNC && (tv->v_type == VAR_PARTIAL
+	if ((opt_p_flags & P_FUNC) && (tv->v_type == VAR_PARTIAL
 						|| tv->v_type == VAR_FUNC))
 	{
 	    // If the option can be set to a function reference or a lambda
@@ -2723,7 +2723,12 @@
 		if (rettv != NULL)
 		{
 		    rettv->v_type = VAR_FUNC;
-		    rettv->vval.v_string = vim_strsave(ufunc->uf_name);
+		    if (STRNCMP(name, "g:", 2) == 0)
+			// Keep the "g:", otherwise script-local may be
+			// assumed.
+			rettv->vval.v_string = vim_strsave(name);
+		    else
+			rettv->vval.v_string = vim_strsave(ufunc->uf_name);
 		    if (rettv->vval.v_string != NULL)
 			func_ref(ufunc->uf_name);
 		}
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 2c871d3..6d098ff 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1224,6 +1224,25 @@
   CheckScriptSuccess(lines)
 enddef
 
+def Test_set_opfunc_to_global_function()
+  var lines =<< trim END
+    vim9script
+    def g:CountSpaces(type = ''): string
+      normal! '[V']y
+      g:result = getreg('"')->count(' ')
+      return ''
+    enddef
+    &operatorfunc = g:CountSpaces
+    new
+    'a b c d e'->setline(1)
+    feedkeys("g@_", 'x')
+    assert_equal(4, g:result)
+    bwipe!
+  END
+  CheckScriptSuccess(lines)
+  &operatorfunc = ''
+enddef
+
 def Test_lambda_type_allocated()
   # Check that unreferencing a partial using a lambda can use the variable type
   # after the lambda has been freed and does not leak memory.
diff --git a/src/version.c b/src/version.c
index 7ee0e17..971510a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3793,
+/**/
     3792,
 /**/
     3791,