diff --git a/Sources/AppBundle/tree/TreeNodeEx.swift b/Sources/AppBundle/tree/TreeNodeEx.swift
index a96919a0..75eb1e94 100644
--- a/Sources/AppBundle/tree/TreeNodeEx.swift
+++ b/Sources/AppBundle/tree/TreeNodeEx.swift
@@ -33,10 +33,11 @@ extension TreeNode {
     var visualWorkspace: Workspace? { workspace ?? nodeMonitor?.activeWorkspace }
 
     var nodeMonitor: Monitor? {
-        guard let parent else { return nil }
-        return switch parent.cases {
-            case .workspace(let parent): parent.workspaceMonitor
-            case .tilingContainer, .macosFullscreenWindowsContainer: parent.nodeMonitor
+        switch self.nodeCases {
+            case .workspace(let ws): ws.workspaceMonitor
+            case .window: parent?.nodeMonitor
+            case .tilingContainer: parent?.nodeMonitor
+            case .macosFullscreenWindowsContainer: parent?.nodeMonitor
             case .macosInvisibleWindowsContainer, .macosPopupWindowsContainer: nil
         }
     }