1 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 27bd23a668..a50e18efce 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -3470,11 +3470,13 @@ void redrawcmd(void)
 
 void compute_cmdrow(void)
 {
-  if (exmode_active || msg_scrolled != 0)
+  if (exmode_active || msg_scrolled != 0) {
     cmdline_row = Rows - 1;
-  else
-    cmdline_row = lastwin->w_winrow + lastwin->w_height
-                  + lastwin->w_status_height;
+  } else {
+    win_T *wp = lastwin_nofloating();
+    cmdline_row = wp->w_winrow + wp->w_height
+                  + wp->w_status_height;
+  }
 }
 
 static void cursorcmd(void)