diff --git a/Scripts/Editor/RenamePopup.cs b/Scripts/Editor/RenamePopup.cs
index f245d4e..5429270 100644
--- a/Scripts/Editor/RenamePopup.cs
+++ b/Scripts/Editor/RenamePopup.cs
@@ -50,9 +50,10 @@ namespace XNodeEditor {
                 if (GUILayout.Button("Revert to default") || (e.isKey && e.keyCode == KeyCode.Return)) {
                     target.name = NodeEditorUtilities.NodeDefaultName(target.GetType());
                     NodeEditor.GetEditor((XNode.Node)target, NodeEditorWindow.current).OnRename();
+                    AssetDatabase.SetMainObject((target as XNode.Node).graph, AssetDatabase.GetAssetPath(target));
                     AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
                     Close();
-					target.TriggerOnValidate();
+                    target.TriggerOnValidate();
                 }
             }
             // Rename asset to input text
@@ -60,9 +61,10 @@ namespace XNodeEditor {
                 if (GUILayout.Button("Apply") || (e.isKey && e.keyCode == KeyCode.Return)) {
                     target.name = input;
                     NodeEditor.GetEditor((XNode.Node)target, NodeEditorWindow.current).OnRename();
+                    AssetDatabase.SetMainObject((target as XNode.Node).graph, AssetDatabase.GetAssetPath(target));
                     AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
                     Close();
-					target.TriggerOnValidate();
+                    target.TriggerOnValidate();
                 }
             }
         }