diff --git a/src/menu/menu.c b/src/menu/menu.c
index c8e6c10b..6e6199f1 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -1140,6 +1140,10 @@ menu_free(struct menu *menu)
 	/* Keep items clean on pipemenu destruction */
 	nullify_item_pointing_to_this_menu(menu);
 
+	if (menu->server->menu_current == menu) {
+		menu_close_root(menu->server);
+	}
+
 	struct menuitem *item, *next;
 	wl_list_for_each_safe(item, next, &menu->menuitems, link) {
 		item_destroy(item);