diff --git a/src/menu/menu.c b/src/menu/menu.c
index 3f0cf777..cde75ccc 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -942,8 +942,8 @@ update_client_send_to_menu(struct server *server)
 
 	struct workspace *workspace;
 
-	wl_list_for_each(workspace, &server->workspaces, link) {
-		if (workspace == server->workspace_current) {
+	wl_list_for_each(workspace, &server->workspaces.all, link) {
+		if (workspace == server->workspaces.current) {
 			current_item = item_create(menu, strdup_printf(">%s<", workspace->name),
 					/*show arrow*/ false);
 		} else {
@@ -993,8 +993,8 @@ update_client_list_combined_menu(struct server *server)
 	struct view *view;
 	struct buf buffer = BUF_INIT;
 
-	wl_list_for_each(workspace, &server->workspaces, link) {
-		buf_add_fmt(&buffer, workspace == server->workspace_current ? ">%s<" : "%s",
+	wl_list_for_each(workspace, &server->workspaces.all, link) {
+		buf_add_fmt(&buffer, workspace == server->workspaces.current ? ">%s<" : "%s",
 				workspace->name);
 		current_item = separator_create(menu, buffer.data);
 		buf_clear(&buffer);