diff --git a/src/core/window.c b/src/core/window.c
index 4c754b6c3..06dba270e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4454,6 +4454,9 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
   const MetaMonitorInfo *old, *new;
   int i;
 
+  if (window->type == META_WINDOW_DESKTOP)
+    return;
+
   old = window->monitor;
 
   /* Start on primary */