diff --git a/src/ui/windows.c b/src/ui/windows.c
index 684e98fd..87b61ab1 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -413,6 +413,8 @@ wins_tidy(void)
         }
 
         windows = new_windows;
+        current = 1;
+        ui_switch_win(1);
         return TRUE;
     } else {
         return FALSE;