diff --git a/src/layershellv1integration.cpp b/src/layershellv1integration.cpp
index b434131d37..147cf6c5c7 100644
--- a/src/layershellv1integration.cpp
+++ b/src/layershellv1integration.cpp
@@ -205,7 +205,9 @@ void LayerShellV1Integration::rearrange()
         rearrangeOutput(output);
     }
 
-    workspace()->updateClientArea();
+    if (workspace()) {
+        workspace()->updateClientArea();
+    }
 }
 
 void LayerShellV1Integration::scheduleRearrange()