1 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 0f402611df..4ed816b157 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -572,8 +572,13 @@ void free_all_mem(void)
   p_ea = false;
   if (first_tabpage->tp_next != NULL)
     do_cmdline_cmd("tabonly!");
-  if (!ONE_WINDOW)
+
+  if (!ONE_WINDOW) {
+    // to keep things simple, don't perform this
+    // ritual inside a float
+    curwin = firstwin;
     do_cmdline_cmd("only!");
+  }
 
   /* Free all spell info. */
   spell_free_all();