diff --git a/Scripts/Editor/NodeEditorAction.cs b/Scripts/Editor/NodeEditorAction.cs
index d6beb8c..804b4c6 100644
--- a/Scripts/Editor/NodeEditorAction.cs
+++ b/Scripts/Editor/NodeEditorAction.cs
@@ -137,7 +137,7 @@ public partial class NodeEditorWindow {
         Vector2 mousePos = Event.current.mousePosition;
         //Get node position
         Vector2 nodePos = GridToWindowPosition(node.position);
-        Rect windowRect = new Rect(nodePos, new Vector2(/*Node width*/200 / zoom, 30 / zoom));
+        Rect windowRect = new Rect(nodePos, new Vector2(200 / zoom, 30 / zoom));
         return windowRect.Contains(mousePos);
     }
 }
\ No newline at end of file
diff --git a/Scripts/Editor/NodeEditorGUI.cs b/Scripts/Editor/NodeEditorGUI.cs
index 8816e86..9698df4 100644
--- a/Scripts/Editor/NodeEditorGUI.cs
+++ b/Scripts/Editor/NodeEditorGUI.cs
@@ -188,7 +188,7 @@ public partial class NodeEditorWindow {
 
             if (e.type != EventType.Layout) {
                 //Check if we are hovering this node
-                Vector2 nodeSize = GUILayoutUtility.GetLastRect().size / zoom;
+                Vector2 nodeSize = GUILayoutUtility.GetLastRect().size;
                 Rect windowRect = new Rect(nodePos, nodeSize);
                 if (windowRect.Contains(mousePos)) hoveredNode = node;
 
diff --git a/Scripts/Editor/NodeEditorWindow.cs b/Scripts/Editor/NodeEditorWindow.cs
index caacf66..6b8a242 100644
--- a/Scripts/Editor/NodeEditorWindow.cs
+++ b/Scripts/Editor/NodeEditorWindow.cs
@@ -67,8 +67,7 @@ public partial class NodeEditorWindow : EditorWindow {
     }
 
     public Rect GridToWindowRect(Rect gridRect) {
-        gridRect.position = GridToWindowPosition(gridRect.position);
-        gridRect.size /= zoom;
+        gridRect.position = GridToWindowPositionNoClipped(gridRect.position);
         return gridRect;
     }