diff --git a/frontend/composables/shopping-list-page/use-shopping-list-page.ts b/frontend/composables/shopping-list-page/use-shopping-list-page.ts
index e482dfa76..cdf853443 100644
--- a/frontend/composables/shopping-list-page/use-shopping-list-page.ts
+++ b/frontend/composables/shopping-list-page/use-shopping-list-page.ts
@@ -164,21 +164,11 @@ export function useShoppingListPage(listId: string) {
   });
 
   return {
-    shoppingList,
-    loadingCounter,
-    recipeReferenceLoading,
-    preserveItemOrder,
-    edit: state.edit,
-    threeDot: state.threeDot,
-    reorderLabelsDialog: state.reorderLabelsDialog,
-    createEditorOpen: state.createEditorOpen,
-    listItems,
-    recipeMap,
     itemsByLabel,
     isOffline,
 
     // Sub-composables
-    ...state.state,
+    ...state,
     ...labels,
     ...crud,
     ...recipes,
diff --git a/frontend/pages/shopping-lists/[id].vue b/frontend/pages/shopping-lists/[id].vue
index 19d7b45d9..61d6f8e0b 100644
--- a/frontend/pages/shopping-lists/[id].vue
+++ b/frontend/pages/shopping-lists/[id].vue
@@ -4,7 +4,7 @@
     class="md-container"
   >
     <BaseDialog
-      v-model="checkAllDialog"
+      v-model="state.checkAllDialog"
       :title="$t('general.confirm')"
       can-confirm
       @confirm="checkAll"
@@ -15,7 +15,7 @@
     </BaseDialog>
 
     <BaseDialog
-      v-model="uncheckAllDialog"
+      v-model="state.uncheckAllDialog"
       :title="$t('general.confirm')"
       can-confirm
       @confirm="uncheckAll"
@@ -26,7 +26,7 @@
     </BaseDialog>
 
     <BaseDialog
-      v-model="deleteCheckedDialog"
+      v-model="state.deleteCheckedDialog"
       :title="$t('general.confirm')"
       can-confirm
       @confirm="deleteChecked"