diff --git a/Scripts/Editor/NodeEditorWindow.cs b/Scripts/Editor/NodeEditorWindow.cs
index 08b0a56..84827fa 100644
--- a/Scripts/Editor/NodeEditorWindow.cs
+++ b/Scripts/Editor/NodeEditorWindow.cs
@@ -70,6 +70,17 @@ namespace XNodeEditor {
             if (graphEditor != null && NodeEditorPreferences.GetSettings().autoSave) AssetDatabase.SaveAssets();
         }
 
+        /// <summary> Handle Selection Change events</summary>
+        private void OnSelectionChange() {
+            if (!EditorApplication.isPlaying)
+                return;
+
+            var nodeGraph = Selection.activeObject as XNode.NodeGraph;
+            if (nodeGraph) {
+                Open(nodeGraph);
+            }
+        }
+
         /// <summary> Create editor window </summary>
         public static NodeEditorWindow Init() {
             NodeEditorWindow w = CreateInstance<NodeEditorWindow>();
@@ -147,14 +158,21 @@ namespace XNodeEditor {
         public static bool OnOpen(int instanceID, int line) {
             XNode.NodeGraph nodeGraph = EditorUtility.InstanceIDToObject(instanceID) as XNode.NodeGraph;
             if (nodeGraph != null) {
-                NodeEditorWindow w = GetWindow(typeof(NodeEditorWindow), false, "xNode", true) as NodeEditorWindow;
-                w.wantsMouseMove = true;
-                w.graph = nodeGraph;
+                Open(nodeGraph);
                 return true;
             }
             return false;
         }
 
+        public static void Open(XNode.NodeGraph graph) {
+            if (!graph)
+                return;
+
+            NodeEditorWindow w = GetWindow(typeof(NodeEditorWindow), false, "xNode", true) as NodeEditorWindow;
+            w.wantsMouseMove = true;
+            w.graph = graph;
+        }
+
         /// <summary> Repaint all open NodeEditorWindows. </summary>
         public static void RepaintAll() {
             NodeEditorWindow[] windows = Resources.FindObjectsOfTypeAll<NodeEditorWindow>();