diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 22b5d7accd..fd72336198 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -792,7 +792,6 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
   }
 
   setmouse();
-  setcursor();
 
   Error err = ERROR_INIT;
   char firstcbuf[2];
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 96e67982ac..466ab057fe 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -125,8 +125,8 @@ describe('ui/ext_messages', function()
     feed(':%s/i/X/gc<cr>')
     screen:expect({
       grid = [[
-        l{2:^i}ne 1                   |
-        l{10:i}ne 2                   |
+        l{2:i}ne 1                   |
+        l{10:i}ne ^2                   |
         {1:~                        }|*3
       ]],
       cmdline = {
@@ -1348,7 +1348,7 @@ stack traceback:
     feed('z=')
     screen:expect({
       grid = [[
-        {100:^helllo}                   |
+        {100:helll^o}                   |
         {1:~                        }|*4
       ]],
       cmdline = {
@@ -1371,7 +1371,7 @@ stack traceback:
     feed('1')
     screen:expect({
       grid = [[
-        {100:^helllo}                   |
+        {100:helll^o}                   |
         {1:~                        }|*4
       ]],
       cmdline = {