diff --git a/Source/Editor/Surface/SurfaceComment.cs b/Source/Editor/Surface/SurfaceComment.cs
index 0138a1b66..10e9fc776 100644
--- a/Source/Editor/Surface/SurfaceComment.cs
+++ b/Source/Editor/Surface/SurfaceComment.cs
@@ -214,22 +214,25 @@ namespace FlaxEditor.Surface
             if (!_isRenaming)
                 Render2D.DrawText(style.FontLarge, Title, _headerRect, style.Foreground, TextAlignment.Center, TextAlignment.Center);
 
-            // Close button
-            Render2D.DrawSprite(style.Cross, _closeButtonRect, _closeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
-
-            // Color button
-            Render2D.DrawSprite(style.Settings, _colorButtonRect, _colorButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
-
-            // Check if is resizing
-            if (_isResizing)
+            if (Surface.CanEdit)
             {
-                // Draw overlay
-                Render2D.FillRectangle(_resizeButtonRect, style.Selection);
-                Render2D.DrawRectangle(_resizeButtonRect, style.SelectionBorder);
-            }
+                // Close button
+                Render2D.DrawSprite(style.Cross, _closeButtonRect, _closeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
 
-            // Resize button
-            Render2D.DrawSprite(style.Scale, _resizeButtonRect, _resizeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
+                // Color button
+                Render2D.DrawSprite(style.Settings, _colorButtonRect, _colorButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
+
+                // Check if is resizing
+                if (_isResizing)
+                {
+                    // Draw overlay
+                    Render2D.FillRectangle(_resizeButtonRect, style.Selection);
+                    Render2D.DrawRectangle(_resizeButtonRect, style.SelectionBorder);
+                }
+
+                // Resize button
+                Render2D.DrawSprite(style.Scale, _resizeButtonRect, _resizeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
+            }
 
             // Selection outline
             if (_isSelected)
diff --git a/Source/Editor/Windows/AssetReferencesGraphWindow.cs b/Source/Editor/Windows/AssetReferencesGraphWindow.cs
index bc1437d97..dcaf98462 100644
--- a/Source/Editor/Windows/AssetReferencesGraphWindow.cs
+++ b/Source/Editor/Windows/AssetReferencesGraphWindow.cs
@@ -140,7 +140,7 @@ namespace FlaxEditor.Windows
         }
 
         private string _cacheFolder;
-        private Guid _assetId;
+        private AssetItem _item;
         private Surface _surface;
         private Label _loadingLabel;
         private CancellationTokenSource _token;
@@ -163,13 +163,13 @@ namespace FlaxEditor.Windows
         public AssetReferencesGraphWindow(Editor editor, AssetItem assetItem)
         : base(editor, false, ScrollBars.None)
         {
-            Title = assetItem.ShortName + " References";
+            _item = assetItem;
+            Title = _item.ShortName + " References";
 
             _tempFolder = StringUtils.NormalizePath(Path.GetDirectoryName(Globals.TemporaryFolder));
             _cacheFolder = Path.Combine(Globals.ProjectCacheFolder, "References");
             if (!Directory.Exists(_cacheFolder))
                 Directory.CreateDirectory(_cacheFolder);
-            _assetId = assetItem.ID;
             _surface = new Surface(this)
             {
                 AnchorPreset = AnchorPresets.StretchAll,
@@ -194,6 +194,7 @@ namespace FlaxEditor.Windows
             _nodesAssets.Add(assetId);
             var node = new AssetNode((uint)_nodes.Count + 1, _surface.Context, GraphNodes[0], GraphGroups[0], assetId);
             _nodes.Add(node);
+
             return node;
         }
 
@@ -392,8 +393,7 @@ namespace FlaxEditor.Windows
             _nodesAssets = new HashSet<Guid>();
             var searchLevel = 4; // TODO: make it as an option (somewhere in window UI)
             // TODO: add option to filter assets by type (eg. show only textures as leaf nodes)
-            var assetNode = SpawnNode(_assetId);
-            // TODO: add some outline or tint color to the main node
+            var assetNode = SpawnNode(_item.ID);
             BuildGraph(assetNode, searchLevel, false);
             ArrangeGraph(assetNode, false);
             BuildGraph(assetNode, searchLevel, true);
@@ -402,6 +402,10 @@ namespace FlaxEditor.Windows
                 return;
             _progress = 100.0f;
 
+            var commentRect = assetNode.EditorBounds;
+            commentRect.Expand(80f);
+            _surface.Context.CreateComment(ref commentRect, _item.ShortName, Color.Green);
+
             // Update UI
             FlaxEngine.Scripting.InvokeOnUpdate(() =>
             {