diff --git a/src/ex_getln.c b/src/ex_getln.c
index 162e555..581c444 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -773,9 +773,7 @@
 		/*
 		 * Open a window to edit the command line (and history).
 		 */
-		save_cmdline(&save_ccline);
 		c = ex_window();
-		restore_cmdline(&save_ccline);
 		some_key_typed = TRUE;
 	    }
 	}
@@ -6904,9 +6902,7 @@
     redraw_later(SOME_VALID);
 
     /* Save the command line info, can be used recursively. */
-    save_ccline = ccline;
-    ccline.cmdbuff = NULL;
-    ccline.cmdprompt = NULL;
+    save_cmdline(&save_ccline);
 
     /* No Ex mode here! */
     exmode_active = 0;
@@ -6953,7 +6949,7 @@
 # endif
 
     /* Restore the command line info. */
-    ccline = save_ccline;
+    restore_cmdline(&save_ccline);
     cmdwin_type = 0;
 
     exmode_active = save_exmode;
diff --git a/src/testdir/test_history.vim b/src/testdir/test_history.vim
index 243ede7..ca31e3f 100644
--- a/src/testdir/test_history.vim
+++ b/src/testdir/test_history.vim
@@ -87,3 +87,20 @@
   call assert_equal(-1, histnr('abc'))
   call assert_fails('call histnr([])', 'E730:')
 endfunction
+
+function Test_Search_history_window()
+  new
+  call setline(1, ['a', 'b', 'a', 'b'])
+  1
+  call feedkeys("/a\<CR>", 'xt')
+  call assert_equal('a', getline('.'))
+  1
+  call feedkeys("/b\<CR>", 'xt')
+  call assert_equal('b', getline('.'))
+  1
+  " select the previous /a command
+  call feedkeys("q/kk\<CR>", 'x!')
+  call assert_equal('a', getline('.'))
+  call assert_equal('a', @/)
+  bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index dfbbe18..a6bbf1b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    172,
+/**/
     171,
 /**/
     170,