diff --git a/workspace.cpp b/workspace.cpp
index 62615f76df..7561fe39eb 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -404,6 +404,11 @@ bool Workspace::workspaceEvent( XEvent * e )
 	XUngrabKeyboard( qt_xdisplay(), kwin_time );
     }
 
+    if ( e->type == PropertyNotify || e->type == ClientMessage ) {
+	if ( netCheck( e ) )
+	    return TRUE;
+    }
+    
     Client * c = findClient( e->xany.window );
     if ( c )
 	return c->windowEvent( e );
@@ -529,10 +534,6 @@ bool Workspace::workspaceEvent( XEvent * e )
 	break;
     case FocusOut:
 	break;
-    case PropertyNotify:
-    case ClientMessage:
-	return netCheck( e );
-	break;
     default:
 	if  ( e->type == Shape::shapeEvent() ) {
 	    c = findClient( ((XShapeEvent *)e)->window );
@@ -1949,7 +1950,7 @@ bool Workspace::netCheck( XEvent* e )
     if ( dirty & NET::DesktopNames )
 	saveDesktopSettings();
 
-    return FALSE;
+    return dirty != 0;
 }
 
 /*!