diff --git a/Scripts/Editor/NodeEditorWindow.cs b/Scripts/Editor/NodeEditorWindow.cs
index 505866d..b0032a9 100644
--- a/Scripts/Editor/NodeEditorWindow.cs
+++ b/Scripts/Editor/NodeEditorWindow.cs
@@ -72,11 +72,8 @@ namespace XNodeEditor {
 
         /// <summary> Handle Selection Change events</summary>
         private void OnSelectionChange() {
-            if (!EditorApplication.isPlaying)
-                return;
-
             var nodeGraph = Selection.activeObject as XNode.NodeGraph;
-            if (nodeGraph) {
+            if (nodeGraph && !AssetDatatbase.Contains(nodeGraph)) {
                 Open(nodeGraph);
             }
         }