diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index 00c77374..8cc19c2c 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -437,7 +437,7 @@ impl Workspace {
 
             // overlay and top layer surfaces
             let lower = {
-                let (upper, lower): (Vec<&LayerSurface>, Vec<&LayerSurface>) = layer_map
+                let (lower, upper): (Vec<&LayerSurface>, Vec<&LayerSurface>) = layer_map
                     .layers()
                     .rev()
                     .partition(|s| matches!(s.layer(), Layer::Background | Layer::Bottom));
diff --git a/src/wayland/handlers/compositor.rs b/src/wayland/handlers/compositor.rs
index 77db7e30..9804e78e 100644
--- a/src/wayland/handlers/compositor.rs
+++ b/src/wayland/handlers/compositor.rs
@@ -100,7 +100,7 @@ impl State {
         if !initial_configure_sent {
             // compute initial dimensions by mapping
             Shell::map_layer(self, &surface);
-            // this will also send a configure
+            surface.layer_surface().send_configure();
         }
         initial_configure_sent
     }