diff --git a/src/nvim/window.c b/src/nvim/window.c
index 6c7ca86636..c0a9b1e39b 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -1916,7 +1916,7 @@ int win_splitmove(win_T *wp, int size, int flags)
   int dir = 0;
   int height = wp->w_height;
 
-  if (firstwin == wp && lastwin_nofloating() == wp) {
+  if (one_window(wp)) {
     return OK;  // nothing to do
   }
   if (is_aucmd_win(wp) || check_split_disallowed(wp) == FAIL) {
@@ -2539,21 +2539,42 @@ bool can_close_in_cmdwin(win_T *win, Error *err)
   return true;
 }
 
-/// Close the possibly last window in a tab page.
+/// Close the possibly last non-floating window in a tab page.
 ///
 /// @param  win          window to close
 /// @param  free_buf     whether to free the window's current buffer
+/// @param  force        close floating windows even if they are modified
 /// @param  prev_curtab  previous tabpage that will be closed if "win" is the
 ///                      last window in the tabpage
 ///
-/// @return false if there are other windows and nothing is done, true otherwise.
-static bool close_last_window_tabpage(win_T *win, bool free_buf, tabpage_T *prev_curtab)
+/// @return false if there are other non-floating windows and nothing is done, true otherwise.
+static bool close_last_window_tabpage(win_T *win, bool free_buf, bool force, tabpage_T *prev_curtab)
   FUNC_ATTR_NONNULL_ARG(1)
 {
-  if (!ONE_WINDOW) {
+  if (!one_window(win)) {
     return false;
   }
 
+  if (lastwin->w_floating && one_window(win)) {
+    if (is_aucmd_win(lastwin)) {
+      emsg(_("E814: Cannot close window, only autocmd window would remain"));
+      return true;
+    }
+    if (force || can_close_floating_windows()) {
+      // close the last window until the there are no floating windows
+      while (lastwin->w_floating) {
+        // `force` flag isn't actually used when closing a floating window.
+        if (win_close(lastwin, free_buf, true) == FAIL) {
+          // If closing the window fails give up, to avoid looping forever.
+          return true;
+        }
+      }
+    } else {
+      emsg(e_floatonly);
+      return true;
+    }
+  }
+
   buf_T *old_curbuf = curbuf;
 
   Terminal *term = win->w_buffer ? win->w_buffer->terminal : NULL;
@@ -2653,30 +2674,11 @@ int win_close(win_T *win, bool free_buf, bool force)
     emsg(_(e_autocmd_close));
     return FAIL;
   }
-  if (lastwin->w_floating && one_window(win)) {
-    if (is_aucmd_win(lastwin)) {
-      emsg(_("E814: Cannot close window, only autocmd window would remain"));
-      return FAIL;
-    }
-    if (force || can_close_floating_windows()) {
-      // close the last window until the there are no floating windows
-      while (lastwin->w_floating) {
-        // `force` flag isn't actually used when closing a floating window.
-        if (win_close(lastwin, free_buf, true) == FAIL) {
-          // If closing the window fails give up, to avoid looping forever.
-          return FAIL;
-        }
-      }
-    } else {
-      emsg(e_floatonly);
-      return FAIL;
-    }
-  }
 
   // When closing the last window in a tab page first go to another tab page
   // and then close the window and the tab page to avoid that curwin and
   // curtab are invalid while we are freeing memory.
-  if (close_last_window_tabpage(win, free_buf, prev_curtab)) {
+  if (close_last_window_tabpage(win, free_buf, force, prev_curtab)) {
     return FAIL;
   }
 
@@ -2771,7 +2773,7 @@ int win_close(win_T *win, bool free_buf, bool force)
   // Autocommands may have closed the window already, or closed the only
   // other window or moved to another tab page.
   if (!win_valid(win) || (!win->w_floating && last_window(win))
-      || close_last_window_tabpage(win, free_buf, prev_curtab)) {
+      || close_last_window_tabpage(win, free_buf, force, prev_curtab)) {
     return FAIL;
   }
 
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 8b7107fdf2..50b4b3b073 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -874,34 +874,38 @@ describe('float window', function()
   end)
 
   describe(':close on non-float with floating windows', function()
+    -- XXX: it isn't really clear whether this should quit Nvim, as if the autocommand
+    -- here is BufUnload then it does quit Nvim.
+    -- But with BufWinLeave, this doesn't quit Nvim if there are no floating windows,
+    -- so it shouldn't quit Nvim if there are floating windows.
     it('does not quit Nvim if BufWinLeave makes it the only non-float', function()
       exec([[
-        let firstbuf = bufnr()
+        let g:buf = bufnr()
         new
-        let midwin = win_getid()
+        let s:midwin = win_getid()
         new
         setlocal bufhidden=wipe
-        call nvim_win_set_config(midwin,
+        call nvim_win_set_config(s:midwin,
               \ #{relative: 'editor', row: 5, col: 5, width: 5, height: 5})
-        autocmd BufWinLeave * ++once exe firstbuf .. 'bwipe!'
+        autocmd BufWinLeave * ++once exe g:buf .. 'bwipe!'
       ]])
       eq('Vim(close):E855: Autocommands caused command to abort', pcall_err(command, 'close'))
       assert_alive()
     end)
 
-    pending('does not crash if BufWinLeave makes it the only non-float in tabpage', function()
+    it('does not crash if BufUnload makes it the only non-float in tabpage', function()
       exec([[
         tabnew
-        let firstbuf = bufnr()
+        let g:buf = bufnr()
         new
-        let midwin = win_getid()
+        let s:midwin = win_getid()
         new
         setlocal bufhidden=wipe
-        call nvim_win_set_config(midwin,
+        call nvim_win_set_config(s:midwin,
               \ #{relative: 'editor', row: 5, col: 5, width: 5, height: 5})
-        autocmd BufWinLeave * ++once exe firstbuf .. 'bwipe!'
+        autocmd BufUnload * ++once exe g:buf .. 'bwipe!'
       ]])
-      eq('Vim(close):E855: Autocommands caused command to abort', pcall_err(command, 'close'))
+      command('close')
       assert_alive()
     end)
   end)