diff --git a/BeefTools/BeefPerf/src/BPApp.bf b/BeefTools/BeefPerf/src/BPApp.bf
index fffe1822..9cd36fa7 100644
--- a/BeefTools/BeefPerf/src/BPApp.bf
+++ b/BeefTools/BeefPerf/src/BPApp.bf
@@ -106,11 +106,6 @@ namespace BeefPerf
 					delete client;
 			}
 
-			Widget.RemoveAndDelete(mWorkspacePanel);
-			Widget.RemoveAndDelete(mBoard);
-			Widget.RemoveAndDelete(mProfilePanel);
-			Widget.RemoveAndDelete(mFindPanel);
-
 			if (!mLogLines.IsEmpty)
 			{
 				var fs = scope FileStream();
@@ -122,7 +117,7 @@ namespace BeefPerf
 				}
 			}
 		}
-		
+
 		static uint32 TimeToUnixTime(DateTime ft)
 		{
 			// takes the last modified date
@@ -518,6 +513,15 @@ namespace BeefPerf
 		{
 			base.Shutdown();
 
+			Widget.RemoveAndDelete(mWorkspacePanel);
+			mWorkspacePanel = null;
+			Widget.RemoveAndDelete(mBoard);
+			mBoard = null;
+			Widget.RemoveAndDelete(mProfilePanel);
+			mProfilePanel = null;
+			Widget.RemoveAndDelete(mFindPanel);
+			mFindPanel = null;
+
 			mShutdownEvent.Set(true);
 		}