1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 666f09e890..350d934825 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -404,10 +404,11 @@ void nvim_win_close(Window window, Boolean force, Error *err)
   if (cmdwin_type != 0) {
     if (win == curwin) {
       cmdwin_result = Ctrl_C;
-    } else {
+      return;
+    } else if (win == cmdwin_old_curwin) {
       api_set_error(err, kErrorTypeException, "%s", e_cmdwin);
+      return;
     }
-    return;
   }
 
   tabpage_T *tabpage = win_find_tabpage(win);