diff --git a/COMPLIANCE b/COMPLIANCE
index 9d3b971a96..bcaa052986 100644
--- a/COMPLIANCE
+++ b/COMPLIANCE
@@ -69,7 +69,6 @@ _NET_NUMBER_OF_DESKTOPS		root window property + message	COMPLETE
         | technique for creating virtual desktops, so it doesn't have    |
         | to set this property.                                          |
 	+----------------------------------------------------------------+
-        CHECKME : check updating of properties
 _NET_DESKTOP_GEOMETRY		root window property + message	COMPLETE
 	+----------------------------------------------------------------+
         | KWin doesn't implement large desktops, so it ignores           |
diff --git a/workspace.cpp b/workspace.cpp
index 7ff1afc97f..74d7d92fd5 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -2427,13 +2427,13 @@ void Workspace::setNumberOfDesktops( int n )
         setCurrentDesktop( numberOfDesktops());
 
     // if increasing the number, do the resizing now,
-    // otherwise after the moving of window to still existing desktops
+    // otherwise after the moving of windows to still existing desktops
     if( old_number_of_desktops < number_of_desktops ) {
+        rootInfo->setNumberOfDesktops( number_of_desktops );
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
         rootInfo->setDesktopViewport( number_of_desktops, *viewports );
         delete[] viewports;
         updateClientArea( true );
-        rootInfo->setNumberOfDesktops( number_of_desktops );
     }
 
     // if the number of desktops decreased, move all