diff --git a/IDE/src/ui/RenameSymbolDialog.bf b/IDE/src/ui/RenameSymbolDialog.bf
index 02de7655..51e43662 100644
--- a/IDE/src/ui/RenameSymbolDialog.bf
+++ b/IDE/src/ui/RenameSymbolDialog.bf
@@ -107,6 +107,14 @@ namespace IDE.ui
 			}
 		}
 
+		public bool IsLocked
+		{
+			get
+			{
+				return mDoLock;
+			}
+		}
+
 		/*public this()
 		{
 
diff --git a/IDE/src/ui/SourceEditWidgetContent.bf b/IDE/src/ui/SourceEditWidgetContent.bf
index ec253297..f73ccefe 100644
--- a/IDE/src/ui/SourceEditWidgetContent.bf
+++ b/IDE/src/ui/SourceEditWidgetContent.bf
@@ -3088,7 +3088,7 @@ namespace IDE.ui
 	                        });
 
 						// Fixits
-						if ((mSourceViewPanel.mIsBeefSource) && (mSourceViewPanel.mProjectSource != null))
+						if ((mSourceViewPanel.mIsBeefSource) && (mSourceViewPanel.mProjectSource != null) && (gApp.mSymbolReferenceHelper?.IsLocked != true))
 						{
 							ResolveParams resolveParams = scope .();
 							mSourceViewPanel.DoClassify(ResolveType.GetFixits, resolveParams, true);
diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf
index bff886c6..b7a03a57 100644
--- a/IDE/src/ui/SourceViewPanel.bf
+++ b/IDE/src/ui/SourceViewPanel.bf
@@ -6100,7 +6100,8 @@ namespace IDE.ui
                 }*/
             }
 
-            if (HasUnsavedChanges())
+			// When files changes we move it to the permanent area
+            if ((HasUnsavedChanges()) && (gApp.mSymbolReferenceHelper?.IsRenaming != true))
             {
                 var parent = mParent;
                 while (parent != null)
@@ -6113,7 +6114,6 @@ namespace IDE.ui
                         // Debug.Assert(activeTab.mContent == this);
                         if (activeTab.mIsRightTab)
                         {
-                            // When files changes we move it to the permanent area
                             IDEApp.sApp.ShowSourceFile(mFilePath, mProjectSource, SourceShowType.ShowExisting, false);
                         }
                         break;