diff --git a/src/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs b/src/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
index a6a8fc8..ff05220 100644
--- a/src/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
+++ b/src/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
@@ -192,7 +192,6 @@ namespace DCFApixels.DragonECS.Unity.Editors
             optionButton.yMax += HeadIconsRect.height;
             optionButton.xMin = optionButton.xMax - 64;
             optionButton.center += Vector2.up * Padding * 1f;
-            //EditorGUI.DrawRect(optionButton, Color.black);
             if (EcsGUI.HitTest(optionButton) && Event.current.type == EventType.MouseUp)
             {
                 componentProperty.isExpanded = !componentProperty.isExpanded;
@@ -209,7 +208,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
             if (UnityEditorUtility.TryGetScriptAsset(componentType, out MonoScript script))
             {
                 optionButton = HeadIconsRect.MoveTo(optionButton.center - (Vector2.right * optionButton.width));
-                EcsGUI.ScriptAssetButton(optionButton).Execute(script);
+                EcsGUI.ScriptAssetButton(optionButton, script);
             }
             //Description icon
             if (string.IsNullOrEmpty(description) == false)
diff --git a/src/EntityTemplate/Editor/EntityTemplateEditor.cs b/src/EntityTemplate/Editor/EntityTemplateEditor.cs
index bbc0558..c65664d 100644
--- a/src/EntityTemplate/Editor/EntityTemplateEditor.cs
+++ b/src/EntityTemplate/Editor/EntityTemplateEditor.cs
@@ -181,7 +181,6 @@ namespace DCFApixels.DragonECS.Unity.Editors
             optionButton.yMax += HeadIconsRect.height;
             optionButton.xMin = optionButton.xMax - 64;
             optionButton.center += Vector2.up * padding * 2f;
-            //EditorGUI.DrawRect(optionButton, Color.black);
             if (EcsGUI.HitTest(optionButton) && Event.current.type == EventType.MouseUp)
             {
                 componentProperty.isExpanded = !componentProperty.isExpanded;
@@ -202,7 +201,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
             if (UnityEditorUtility.TryGetScriptAsset(componentType, out MonoScript script))
             {
                 optionButton = HeadIconsRect.MoveTo(optionButton.center - (Vector2.right * optionButton.width));
-                EcsGUI.ScriptAssetButton(optionButton).Execute(script);
+                EcsGUI.ScriptAssetButton(optionButton, script);
             }
             //Description icon
             if (string.IsNullOrEmpty(description) == false)
diff --git a/src/Internal/Editor/EcsGUI.cs b/src/Internal/Editor/EcsGUI.cs
index a95772b..949fa94 100644
--- a/src/Internal/Editor/EcsGUI.cs
+++ b/src/Internal/Editor/EcsGUI.cs
@@ -250,7 +250,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
                 }
             }
         }
-        public static ScriptAssetButtonCommand ScriptAssetButton(Rect position)
+        public static ScriptAssetButtonCommand ScriptAssetButton(Rect position, MonoScript script)
         {
             var current = Event.current;
 
@@ -265,13 +265,11 @@ namespace DCFApixels.DragonECS.Unity.Editors
             {
                 if (current.type == EventType.MouseUp)
                 {
-                    //EditorGUIUtility.PingObject(script);
-                    return new ScriptAssetButtonCommand(ScriptAssetButtonCommand.Command.OneClick);
+                    EditorGUIUtility.PingObject(script);
                 }
                 else if (current.type == EventType.MouseDown && current.clickCount >= 2)
                 {
-                    //AssetDatabase.OpenAsset(script);
-                    return new ScriptAssetButtonCommand(ScriptAssetButtonCommand.Command.DoubleClick);
+                    AssetDatabase.OpenAsset(script);
                 }
             }
             return default;
@@ -627,7 +625,6 @@ namespace DCFApixels.DragonECS.Unity.Editors
                     optionButton.yMax += HeadIconsRect.height;
                     optionButton.xMin = optionButton.xMax - 64;
                     optionButton.center += Vector2.up * padding * 2f;
-                    //EditorGUI.DrawRect(optionButton, Color.black);
                     if (HitTest(optionButton) && Event.current.type == EventType.MouseUp)
                     {
                         ref bool isExpanded = ref expandMatrix.Down();
@@ -649,7 +646,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
                     if (UnityEditorUtility.TryGetScriptAsset(componentType, out MonoScript script))
                     {
                         optionButton = HeadIconsRect.MoveTo(optionButton.center - (Vector2.right * optionButton.width));
-                        ScriptAssetButton(optionButton).Execute(script);
+                        ScriptAssetButton(optionButton, script);
                     }
                     //Description icon
                     if (string.IsNullOrEmpty(meta.Description.Text) == false)