From f032e7dbd51cdaf8b219e58127db7f09814f7997 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Fri, 12 Jun 2026 16:17:53 +0200
Subject: [PATCH] shell/focus: Order sticky windows before fullscreen windows

---
 src/shell/focus/order.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/shell/focus/order.rs b/src/shell/focus/order.rs
index 6d021e6c..d02b310e 100644
--- a/src/shell/focus/order.rs
+++ b/src/shell/focus/order.rs
@@ -231,9 +231,7 @@ fn render_input_order_internal<R: 'static>(
         }
 
         // sticky window popups
-        if !has_focused_fullscreen {
-            callback(Stage::StickyPopups(&set.sticky_layer))?;
-        }
+        callback(Stage::StickyPopups(&set.sticky_layer))?;
     }
 
     if element_filter != ElementFilter::LayerShellOnly {
@@ -313,11 +311,11 @@ fn render_input_order_internal<R: 'static>(
         for (layer, location) in layer_surfaces(output, Layer::Top, element_filter) {
             callback(Stage::LayerSurface { layer, location })?;
         }
+    }
 
-        // sticky windows
-        if element_filter != ElementFilter::LayerShellOnly {
-            callback(Stage::Sticky(&set.sticky_layer))?;
-        }
+    // sticky windows
+    if element_filter != ElementFilter::LayerShellOnly {
+        callback(Stage::Sticky(&set.sticky_layer))?;
     }
 
     if element_filter != ElementFilter::LayerShellOnly {