diff --git a/lib/renderers/wayland/wayland.c b/lib/renderers/wayland/wayland.c
index 69ca230..5309280 100644
--- a/lib/renderers/wayland/wayland.c
+++ b/lib/renderers/wayland/wayland.c
@@ -40,7 +40,7 @@ render(const struct bm_menu *menu)
     if (wayland->input.code != wayland->input.last_code) {
         struct window *window;
             wl_list_for_each(window, &wayland->windows, link) {
-            bm_wl_window_render(window, menu);
+            bm_wl_window_render(window, wayland->display, menu);
         }
         wayland->input.last_code = wayland->input.code;
     }
diff --git a/lib/renderers/wayland/wayland.h b/lib/renderers/wayland/wayland.h
index 9fd9dc7..e0aeb4d 100644
--- a/lib/renderers/wayland/wayland.h
+++ b/lib/renderers/wayland/wayland.h
@@ -117,7 +117,7 @@ struct wayland {
 void bm_wl_repeat(struct wayland *wayland);
 bool bm_wl_registry_register(struct wayland *wayland);
 void bm_wl_registry_destroy(struct wayland *wayland);
-void bm_wl_window_render(struct window *window, const struct bm_menu *menu);
+void bm_wl_window_render(struct window *window, struct wl_display *display, const struct bm_menu *menu);
 void bm_wl_window_set_bottom(struct window *window, struct wl_display *display, bool bottom);
 bool bm_wl_window_create(struct window *window, struct wl_display *display, struct wl_shm *shm, struct wl_output *output, struct zwlr_layer_shell_v1 *layer_shell, struct wl_surface *surface);
 void bm_wl_window_destroy(struct window *window);
diff --git a/lib/renderers/wayland/window.c b/lib/renderers/wayland/window.c
index e195e38..5ca4578 100644
--- a/lib/renderers/wayland/window.c
+++ b/lib/renderers/wayland/window.c
@@ -204,7 +204,7 @@ static const struct wl_callback_listener listener = {
 };
 
 void
-bm_wl_window_render(struct window *window, const struct bm_menu *menu)
+bm_wl_window_render(struct window *window, struct wl_display *display, const struct bm_menu *menu)
 {
     assert(window && menu);
 
@@ -229,6 +229,9 @@ bm_wl_window_render(struct window *window, const struct bm_menu *menu)
             break;
 
         window->height = result.height;
+        zwlr_layer_surface_v1_set_size(window->layer_surface, 0, window->height);
+        wl_surface_commit(window->surface);
+        wl_display_roundtrip(display);
         destroy_buffer(buffer);
     }
 
@@ -299,6 +302,7 @@ bm_wl_window_create(struct window *window, struct wl_display *display, struct wl
 
     if (layer_shell && (window->layer_surface = zwlr_layer_shell_v1_get_layer_surface(layer_shell, surface, output, ZWLR_LAYER_SHELL_V1_LAYER_TOP, "menu"))) {
         zwlr_layer_surface_v1_add_listener(window->layer_surface, &layer_surface_listener, window);
+        zwlr_layer_surface_v1_set_exclusive_zone(window->layer_surface, -1);
         zwlr_layer_surface_v1_set_anchor(window->layer_surface, (window->bottom ? ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM : ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT);
         zwlr_layer_surface_v1_set_size(window->layer_surface, 0, 32);
         zwlr_layer_surface_v1_set_keyboard_interactivity(window->layer_surface, true);