diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index a9b3058e..a71d7b38 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -71,6 +71,8 @@ import {parseTaskText, PrefixMode} from '@/modules/parseTaskText'
 import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
 import {PREFIXES} from '@/modules/parseTaskText'
 import {useListStore} from '@/stores/lists'
+import {useNamespaceStore} from '@/stores/namespaces'
+import {useLabelStore} from '@/stores/labels'
 
 const TYPE_LIST = 'list'
 const TYPE_TASK = 'task'
@@ -139,7 +141,7 @@ export default defineComponent({
 						}
 
 						if (typeof ncache[l.namespaceId] === 'undefined') {
-							ncache[l.namespaceId] = this.$store.getters['namespaces/getNamespaceById'](l.namespaceId)
+							ncache[l.namespaceId] = useNamespaceStore().getNamespaceById(l.namespaceId)
 						}
 
 						return !ncache[l.namespaceId].isArchived
@@ -206,7 +208,7 @@ export default defineComponent({
 					case CMD_NEW_TASK:
 						return this.$t('quickActions.createTask', {title: this.currentList.title})
 					case CMD_NEW_LIST:
-						namespace = this.$store.getters['namespaces/getNamespaceById'](this.currentList.namespaceId)
+						namespace = useNamespaceStore().getNamespaceById(this.currentList.namespaceId)
 						return this.$t('quickActions.createList', {title: namespace.title})
 				}
 			}
@@ -309,7 +311,7 @@ export default defineComponent({
 			}
 
 			if (labels.length > 0) {
-				const labelIds = this.$store.getters['labels/getLabelsByExactTitles'](labels).map(l => l.id)
+				const labelIds = useLabelStore().getLabelsByExactTitles(labels).map(l => l.id)
 				if (labelIds.length > 0) {
 					params.filter_by.push('labels')
 					params.filter_value.push(labelIds.join())
@@ -436,7 +438,7 @@ export default defineComponent({
 		async newNamespace() {
 			const newNamespace = new NamespaceModel({title: this.query})
 
-			await this.$store.dispatch('namespaces/createNamespace', newNamespace)
+			await useNamespaceStore().createNamespace(newNamespace)
 			this.$message.success({message: this.$t('namespace.create.success')})
 			this.closeQuickActions()
 		},
diff --git a/src/views/list/settings/background.vue b/src/views/list/settings/background.vue
index 565e037f..cb48ca68 100644
--- a/src/views/list/settings/background.vue
+++ b/src/views/list/settings/background.vue
@@ -94,8 +94,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-export default defineComponent({ name: 'list-setting-background' })
+export default { name: 'list-setting-background' }
 </script>
 
 <script setup lang="ts">
@@ -106,6 +105,7 @@ import {useRoute, useRouter} from 'vue-router'
 import debounce from 'lodash.debounce'
 import BaseButton from '@/components/base/BaseButton.vue'
 import {useListStore} from '@/stores/lists'
+import {useNamespaceStore} from '@/stores/namespaces'
 
 import BackgroundUnsplashService from '@/services/backgroundUnsplash'
 import BackgroundUploadService from '@/services/backgroundUpload'
@@ -117,7 +117,7 @@ import {useTitle} from '@/composables/useTitle'
 import {CURRENT_LIST} from '@/store/mutation-types'
 
 import CreateEdit from '@/components/misc/create-edit.vue'
-import { success } from '@/message'
+import {success} from '@/message'
 
 const SEARCH_DEBOUNCE = 300
 
@@ -143,6 +143,7 @@ const debounceNewBackgroundSearch = debounce(newBackgroundSearch, SEARCH_DEBOUNC
 const backgroundUploadService = ref(new BackgroundUploadService())
 const listService = ref(new ListService())
 const listStore = useListStore()
+const namespaceStore = useNamespaceStore()
 
 const unsplashBackgroundEnabled = computed(() => store.state.config.enabledBackgroundProviders.includes('unsplash'))
 const uploadBackgroundEnabled = computed(() => store.state.config.enabledBackgroundProviders.includes('upload'))
@@ -187,7 +188,7 @@ async function setBackground(backgroundId: string) {
 
 	const list = await backgroundService.update({id: backgroundId, listId: route.params.listId})
 	await store.dispatch(CURRENT_LIST, {list, forceUpdate: true})
-	store.commit('namespaces/setListInNamespaceById', list)
+	namespaceStore.setListInNamespaceById(list)
 	listStore.setList(list)
 	success({message: t('list.background.success')})
 }
@@ -200,7 +201,7 @@ async function uploadBackground() {
 
 	const list = await backgroundUploadService.value.create(route.params.listId, backgroundUploadInput.value?.files[0])
 	await store.dispatch(CURRENT_LIST, {list, forceUpdate: true})
-	store.commit('namespaces/setListInNamespaceById', list)
+	namespaceStore.setListInNamespaceById(list)
 	listStore.setList(list)
 	success({message: t('list.background.success')})
 }
@@ -208,7 +209,7 @@ async function uploadBackground() {
 async function removeBackground() {
 	const list = await listService.value.removeBackground(currentList.value)
 	await store.dispatch(CURRENT_LIST, {list, forceUpdate: true})
-	store.commit('namespaces/setListInNamespaceById', list)
+	namespaceStore.setListInNamespaceById(list)
 	listStore.setList(list)
 	success({message: t('list.background.removeSuccess')})
 	router.back()