diff --git a/UICatalog/UICatalog.cs b/UICatalog/UICatalog.cs
index bdfa43b9f..dc8e62f7e 100644
--- a/UICatalog/UICatalog.cs
+++ b/UICatalog/UICatalog.cs
@@ -87,6 +87,8 @@ namespace UICatalog {
 				scenario.Run ();
 				scenario = GetScenarioToRun ();
 			}
+			if (!_top.Running)
+				Application.Shutdown (true);
 		}
 
 		/// <summary>
@@ -118,8 +120,8 @@ namespace UICatalog {
 				}
 			};
 
-			Application.Run (_top, true);
-			Application.Shutdown ();
+			Application.Run (_top, false);
+			Application.Shutdown (false);
 			return _runningScenario;
 		}