diff --git a/workspace.cpp b/workspace.cpp
index ea6ca10974..cb375b1221 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1001,10 +1001,11 @@ void Workspace::reconfigure()
  */
 bool Workspace::waitForCompositingSetup()
     {
-    if( !reconfigureTimer.isActive() )
-        return false;
-    reconfigureTimer.stop();
-    slotReconfigure();
+    if( reconfigureTimer.isActive() )
+        {
+        reconfigureTimer.stop();
+        slotReconfigure();
+        }
     return compositingActive();
     }