diff --git a/src/render/renderer/renderer.rs b/src/render/renderer/renderer.rs
index 7e96bb8c..c6c270d8 100644
--- a/src/render/renderer/renderer.rs
+++ b/src/render/renderer/renderer.rs
@@ -95,6 +95,7 @@ impl Renderer<'_> {
         if let Some(ws) = output.workspace.get() {
             if let Some(fs) = ws.fullscreen.get() {
                 fs.tl_as_node().node_render(self, x, y);
+                render_layer!(output.layers[2]);
                 render_layer!(output.layers[3]);
                 return;
             }
diff --git a/src/tree/output.rs b/src/tree/output.rs
index 3f561f05..505dce35 100644
--- a/src/tree/output.rs
+++ b/src/tree/output.rs
@@ -536,7 +536,7 @@ impl Node for OutputNode {
             return FindTreeResult::AcceptsInput;
         }
         {
-            let res = self.find_layer_surface_at(x, y, &[OVERLAY], tree);
+            let res = self.find_layer_surface_at(x, y, &[OVERLAY, TOP], tree);
             if res.accepts_input() {
                 return res;
             }
@@ -551,12 +551,6 @@ impl Node for OutputNode {
                 return fs.tl_as_node().node_find_tree_at(x, y, tree);
             }
         }
-        {
-            let res = self.find_layer_surface_at(x, y, &[TOP], tree);
-            if res.accepts_input() {
-                return res;
-            }
-        }
         {
             let (x_abs, y_abs) = self.global.pos.get().translate_inv(x, y);
             for stacked in self.state.root.stacked.rev_iter() {