diff --git a/IDE/src/ui/RenameSymbolDialog.bf b/IDE/src/ui/RenameSymbolDialog.bf
index 830becf9..d9a46d9e 100644
--- a/IDE/src/ui/RenameSymbolDialog.bf
+++ b/IDE/src/ui/RenameSymbolDialog.bf
@@ -153,6 +153,9 @@ namespace IDE.ui
 			if (!mAwaitingGetSymbolInfo)
 				return true;
 
+			if (gApp.mBfResolveCompiler == null)
+				return false;
+
 			if (gApp.mBfResolveCompiler.IsPerformingBackgroundOperationHi())
 				return false;
 
@@ -850,6 +853,12 @@ namespace IDE.ui
         {
             base.Update();
 
+			if (gApp.mBfResolveCompiler == null)
+			{
+				Close();
+				return;
+			}
+
 			if ((mUpdatingProjectSources == null) && (mUpdateCnt > 30) && (gApp.mUpdateCnt % 4 == 0))
 				MarkDirty();