diff --git a/Terminal.Gui/Application.cs b/Terminal.Gui/Application.cs
index b2d2cbe36..585a35351 100644
--- a/Terminal.Gui/Application.cs
+++ b/Terminal.Gui/Application.cs
@@ -1028,11 +1028,15 @@ public static partial class Application
             Refresh ();
         }
 
+        if (Top == runState.Toplevel)
+        {
+           // Top = null;
+        }
+
+        Debug.Assert(Current != runState.Toplevel);
         runState.Toplevel?.Dispose ();
         runState.Toplevel = null;
         runState.Dispose ();
-
-        // BUGBUG: Application.Top is now invalid?!?!
     }
 
     #endregion Run (Begin, Run, End)