diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 47df6b2cfb..5c85e5fe88 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -104,6 +104,7 @@ typedef struct {
 typedef struct {
   pos_T search_start;   // where 'incsearch' starts searching
   pos_T save_cursor;
+  handle_T winid;       // window where this state is valid
   viewstate_T init_viewstate;
   viewstate_T old_viewstate;
   pos_T match_start;
@@ -257,6 +258,7 @@ static void restore_viewstate(win_T *wp, viewstate_T *vs)
 
 static void init_incsearch_state(incsearch_state_T *s)
 {
+  s->winid = curwin->handle;
   s->match_start = curwin->w_cursor;
   s->did_incsearch = false;
   s->incsearch_postponed = false;
@@ -1214,6 +1216,10 @@ static int command_line_execute(VimState *state, int key)
     } else {
       map_execute_lua(false);
     }
+    // If the window changed incremental search state is not valid.
+    if (s->is_state.winid != curwin->handle) {
+      init_incsearch_state(&s->is_state);
+    }
     // Re-apply 'incsearch' highlighting in case it was cleared.
     if (display_tick > display_tick_saved && s->is_state.did_incsearch) {
       may_do_incsearch_highlighting(s->firstc, s->count, &s->is_state);
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index 9c83e2a178..2819090294 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -682,6 +682,32 @@ describe('search highlighting', function()
     screen:expect_unchanged(true)
   end)
 
+  it('no ml_get error with incsearch and <Cmd> mapping that opens window', function()
+    command('cnoremap <F3> <Cmd>vnew<Bar>redraw!<CR>')
+    fn.setline(1, { 'foo', 'bar', 'baz' })
+    feed('G/z')
+    screen:expect([[
+      foo                                     |
+      bar                                     |
+      ba{2:z}                                     |
+      {1:~                                       }|*3
+      /z^                                      |
+    ]])
+    feed('<F3>')
+    screen:expect([[
+                          │foo                |
+      {1:~                   }│bar                |
+      {1:~                   }│baz                |
+      {1:~                   }│{1:~                  }|*2
+      {3:[No Name]            }{2:[No Name] [+]      }|
+      /z^                                      |
+    ]])
+    eq('', n.api.nvim_get_vvar('errmsg'))
+    feed('<C-G>')
+    screen:expect_unchanged(true)
+    eq('', n.api.nvim_get_vvar('errmsg'))
+  end)
+
   it('highlight is not after redraw during substitute confirm prompt', function()
     fn.setline(1, { 'foo', 'bar' })
     command('set nohlsearch')