diff --git a/runtime/lua/vim/_core/ui2/messages.lua b/runtime/lua/vim/_core/ui2/messages.lua
index 2421647a81..22c58e4ccb 100644
--- a/runtime/lua/vim/_core/ui2/messages.lua
+++ b/runtime/lua/vim/_core/ui2/messages.lua
@@ -582,8 +582,8 @@ local typed_g = false
 local function cmd_on_key(key, typed)
   -- Don't dismiss for non-typed keys and mouse movement. When 'g' is passed (typed
   -- or mapped), wait until the next key to avoid flickering when the pager is opened.
-  if typed == '' or (not typed_g and (typed == '<MouseMove>' or typed == 'g' or key == 'g')) then
-    typed_g = typed == 'g' or key == 'g'
+  if not typed_g and (typed == '' or (typed == '<MouseMove>' or typed == 'g' or key == 'g')) then
+    typed_g = typed ~= '' and (typed == 'g' or key == 'g')
     return
   end
   if typed == ':' or ui.cmd.level > 0 or fn.getcmdtype() ~= '' then
diff --git a/test/functional/ui/messages2_spec.lua b/test/functional/ui/messages2_spec.lua
index 306cdc324e..8271266171 100644
--- a/test/functional/ui/messages2_spec.lua
+++ b/test/functional/ui/messages2_spec.lua
@@ -566,6 +566,7 @@ describe('messages2', function()
 
   it('pager for consecutive command messages is not focused #41061', function()
     local win = api.nvim_get_current_win()
+    command('nnoremap j gj')
     command('echo "foo\nbar"')
     feed(':echo "baz"<CR>')
     screen:expect([[
@@ -607,6 +608,11 @@ describe('messages2', function()
     n.poke_eventloop()
     t.eq(win, api.nvim_get_current_win())
     feed('j')
+    screen:expect([[
+      ^                                                     |
+      {1:~                                                    }|*12
+      {16::}{15:echo} {26:"baz"}                                          |
+    ]])
     -- A typed command that emits no message keeps the pager; the next key dismisses it.
     command('echo "foo\nbar"')
     feed(':echo "baz"<CR>')