diff --git a/trunk/ProcessHacker/Forms/HackerWindow.cs b/trunk/ProcessHacker/Forms/HackerWindow.cs
index cbf7c399b..f7d58c40f 100644
--- a/trunk/ProcessHacker/Forms/HackerWindow.cs
+++ b/trunk/ProcessHacker/Forms/HackerWindow.cs
@@ -3333,7 +3333,6 @@ namespace ProcessHacker
 
         public HackerWindow()
         {
-            Program.HackerWindow = this;
             processP = Program.ProcessProvider;
             serviceP = Program.ServiceProvider;
             networkP = Program.NetworkProvider;
diff --git a/trunk/ProcessHacker/Program/Program.cs b/trunk/ProcessHacker/Program/Program.cs
index 21956c8c6..eb2c363b7 100644
--- a/trunk/ProcessHacker/Program/Program.cs
+++ b/trunk/ProcessHacker/Program/Program.cs
@@ -279,8 +279,8 @@ namespace ProcessHacker
             // Create the shared waiter.
             SharedWaiter = new ProcessHacker.Native.Threading.Waiter();
 
-            new HackerWindow();
-            Application.Run();
+            HackerWindow = new HackerWindow();
+            Application.Run(HackerWindow);
         }
 
         private static void ShowCommandLineUsage()