diff --git a/UICatalog/Scenario.cs b/UICatalog/Scenario.cs
index e69dddf19..e0bebed68 100644
--- a/UICatalog/Scenario.cs
+++ b/UICatalog/Scenario.cs
@@ -90,8 +90,12 @@ public class Scenario : IDisposable
 
     public void Dispose ()
     {
+        // BUGBUG: Top should have already been disposed. We dispose it here until we can fix the scenarios that are doing it wrong.
         Top?.Dispose ();
+
+        // We created Win, so we Dispose it.
         Win?.Dispose ();
+
         // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
         Dispose (true);
         GC.SuppressFinalize (this);