diff --git a/src/core/window.c b/src/core/window.c
index 3c00bfe3d..8a50ae29e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -6137,6 +6137,8 @@ meta_window_get_default_layer (MetaWindow *window)
     return META_LAYER_BOTTOM;
   else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window))
     return META_LAYER_TOP;
+  else if (window->type == META_WINDOW_DESKTOP)
+    return META_LAYER_DESKTOP;
   else
     return META_LAYER_NORMAL;
 }
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 7ae5d8059..5243655ab 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -1920,10 +1920,6 @@ get_standalone_layer (MetaWindow *window)
 
   switch (window->type)
     {
-    case META_WINDOW_DESKTOP:
-      layer = META_LAYER_DESKTOP;
-      break;
-
     case META_WINDOW_DOCK:
       if (window->wm_state_below ||
           (window->monitor && window->monitor->in_fullscreen))