1 files changed, 3 insertions, 6 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 0b3e1edb..b1e3464a 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -251,14 +251,11 @@ static void output_for_each_surface(struct sway_output *output,
         };
 
         struct sway_workspace *workspace = output_get_active_workspace(output);
-        if (!workspace) {
-                return;
-        }
         struct sway_container *fullscreen_con = root->fullscreen_global;
-        if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) {
-                fullscreen_con = NULL;
-        }
         if (!fullscreen_con) {
+                if (!workspace) {
+                        return;
+                }
                 fullscreen_con = workspace->current.fullscreen;
         }
         if (fullscreen_con) {