diff --git a/src/normal.c b/src/normal.c
index 6b3a78b..e597e92 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5724,7 +5724,11 @@
 	(void)normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
     }
     else
+    {
+	g_tag_at_cursor = TRUE;
 	do_cmdline_cmd(buf);
+	g_tag_at_cursor = FALSE;
+    }
 
     vim_free(buf);
 }