diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index 7da934fbcd..7bc2096de6 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="content-auth" :class="{'z-unset': modalActive}">
+	<div class="content-auth">
 		<BaseButton
 			v-if="menuActive"
 			@click="$store.commit('menuActive', false)"
@@ -129,7 +129,6 @@ const store = useStore()
 const background = computed(() => store.state.background)
 const blurHash = computed(() => store.state.blurHash)
 const menuActive = computed(() => store.state.menuActive)
-const modalActive = computed(() => store.state.modalActive)
 
 function showKeyboardShortcuts() {
 	store.commit(KEYBOARD_SHORTCUTS_ACTIVE, true)
diff --git a/src/components/list/partials/filter-popup.vue b/src/components/list/partials/filter-popup.vue
index d8d94906fd..e0de966e95 100644
--- a/src/components/list/partials/filter-popup.vue
+++ b/src/components/list/partials/filter-popup.vue
@@ -13,7 +13,13 @@
 	>
 		{{ $t('filters.title') }}
 	</x-button>
-	<modal @close="() => modalOpen = false" :enabled="modalOpen">
+	<modal
+		@close="() => modalOpen = false"
+		:enabled="modalOpen"
+		transition-name="fade"
+		:overflow="true"
+		variant="hint-modal"
+	>
 		<filters
 			:has-title="true"
 			v-model="value"
diff --git a/src/components/misc/modal.vue b/src/components/misc/modal.vue
index 249bc1fe0f..23f0a7da83 100644
--- a/src/components/misc/modal.vue
+++ b/src/components/misc/modal.vue
@@ -1,72 +1,71 @@
 <template>
-	<!-- FIXME: transition should not be included in the modal -->
-	<transition name="modal">
-		<section
-			v-if="enabled"
-			class="modal-mask"
-			:class="[
+	<Teleport to="body">
+		<!-- FIXME: transition should not be included in the modal -->
+		<transition name="modal">
+			<section
+				v-if="enabled"
+				class="modal-mask"
+				:class="[
 				{ 'has-overflow': overflow },
 				variant,
 			]"
-			ref="modal"
-		>
-			<div
-				class="modal-container"
-				@click.self.prevent.stop="$emit('close')"
-				v-shortcut="'Escape'"
+				ref="modal"
 			>
 				<div
-					class="modal-content"
-					:class="{
+					class="modal-container"
+					@click.self.prevent.stop="$emit('close')"
+					v-shortcut="'Escape'"
+				>
+					<div
+						class="modal-content"
+						:class="{
 						'has-overflow': overflow,
 						'is-wide': wide
 					}"
-				>
-					<BaseButton
-						@click="$emit('close')"
-						class="close"
 					>
-						<icon icon="times"/>
-					</BaseButton>
+						<BaseButton
+							@click="$emit('close')"
+							class="close"
+						>
+							<icon icon="times"/>
+						</BaseButton>
 
-					<slot>
-						<div class="header">
-							<slot name="header"></slot>
-						</div>
-						<div class="content">
-							<slot name="text"></slot>
-						</div>
-						<div class="actions">
-							<x-button
-								@click="$emit('close')"
-								variant="tertiary"
-								class="has-text-danger"
-							>
-								{{ $t('misc.cancel') }}
-							</x-button>
-							<x-button
-								@click="$emit('submit')"
-								variant="primary"
-								v-cy="'modalPrimary'"
-								:shadow="false"
-							>
-								{{ $t('misc.doit') }}
-							</x-button>
-						</div>
-					</slot>
+						<slot>
+							<div class="header">
+								<slot name="header"></slot>
+							</div>
+							<div class="content">
+								<slot name="text"></slot>
+							</div>
+							<div class="actions">
+								<x-button
+									@click="$emit('close')"
+									variant="tertiary"
+									class="has-text-danger"
+								>
+									{{ $t('misc.cancel') }}
+								</x-button>
+								<x-button
+									@click="$emit('submit')"
+									variant="primary"
+									v-cy="'modalPrimary'"
+									:shadow="false"
+								>
+									{{ $t('misc.doit') }}
+								</x-button>
+							</div>
+						</slot>
+					</div>
 				</div>
-			</div>
-		</section>
-	</transition>
+			</section>
+		</transition>
+	</Teleport>
 </template>
 
 <script lang="ts" setup>
 import BaseButton from '@/components/base/BaseButton.vue'
-import {ref, watch} from 'vue'
+import {onUnmounted, ref, watch} from 'vue'
 import {useScrollLock} from '@vueuse/core'
-import {useStore} from 'vuex'
-
-const store = useStore()
 
 const props = withDefaults(defineProps<{
 	enabled?: boolean,
@@ -89,9 +88,10 @@ watch(
 	() => props.enabled,
 	enabled => {
 		scrollLock.value = enabled
-		store.commit('modalActive', enabled)
 	},
 )
+
+onUnmounted(() => scrollLock.value = false)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/index.ts b/src/store/index.ts
index 54fad49ed1..aff24495ea 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -51,7 +51,6 @@ export const store = createStore({
 		menuActive: true,
 		keyboardShortcutsActive: false,
 		quickActionsActive: false,
-		modalActive: false,
 	},
 	mutations: {
 		[LOADING](state, loading) {
@@ -90,9 +89,6 @@ export const store = createStore({
 		[BLUR_HASH](state, blurHash) {
 			state.blurHash = blurHash
 		},
-		modalActive(state, active) {
-			state.modalActive = active
-		},
 	},
 	actions: {
 		async [CURRENT_LIST]({state, commit}, {list, forceUpdate = false}) {