diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index 276ddb6f0..d98b0fa97 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -1,8 +1,12 @@
 <template>
 	<div>
-		<a @click="$store.commit('menuActive', false)" class="menu-hide-button" v-if="menuActive">
+		<BaseButton
+			v-if="menuActive"
+			@click="$store.commit('menuActive', false)"
+			class="menu-hide-button" 
+		>
 			<icon icon="times" />
-		</a>
+		</BaseButton>
 		<div
 			:class="{'has-background': background}"
 			:style="{'background-image': background && `url(${background})`}"
@@ -16,7 +20,11 @@
 				]"
 				class="app-content"
 			>
-				<a @click="$store.commit('menuActive', false)" class="mobile-overlay" v-if="menuActive"></a>
+				<BaseButton
+					v-if="menuActive"
+					@click="$store.commit('menuActive', false)"
+					class="mobile-overlay"
+				/>
 
 				<quick-actions/>
 
@@ -28,7 +36,9 @@
 				</router-view>
 
 				<transition name="modal">
-					<component v-if="currentModal" :is="currentModal" />
+					<TaskDetailViewModal v-if="currentModal" >
+						<component :is="currentModal" />
+					</TaskDetailViewModal>
 				</transition>
 
 				<a
@@ -52,25 +62,23 @@ import {useEventListener} from '@vueuse/core'
 import {CURRENT_LIST, KEYBOARD_SHORTCUTS_ACTIVE, MENU_ACTIVE} from '@/store/mutation-types'
 import Navigation from '@/components/home/navigation.vue'
 import QuickActions from '@/components/quick-actions/quick-actions.vue'
+import TaskDetailViewModal from '@/views/tasks/TaskDetailViewModal.vue'
+import BaseButton from '@/components/base/BaseButton.vue'
 
 function useRouteWithModal() {
 	const router = useRouter()
 	const route = useRoute()
-	const historyState = computed(() => route.fullPath && window.history.state)
+	const backdropView = computed(() => route.fullPath && window.history.state.backdropView)
 
 	const routeWithModal = computed(() => {
-		if (historyState.value.backdropView) {
-			return router.resolve(historyState.value.backdropView)
-		} else {
-			return route
-		}
+		return backdropView.value
+			? router.resolve(backdropView.value)
+			: route
 	})
 
 	const currentModal = shallowRef<VNode>()
 	watchEffect(() => {
-		const hasBackdropView = historyState.value.backdropView
-
-		if (!hasBackdropView) {
+		if (!backdropView.value) {
 			currentModal.value = undefined
 			return
 		}
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 1182c2962..85293deca 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -170,7 +170,8 @@ export default {
 			return {
 				name: 'task.detail',
 				params: { id: this.task.id },
-				state: { backdropView: this.$router.currentRoute.value.fullPath },
+				// TODO: re-enable opening task detail in modal
+				// state: { backdropView: this.$router.currentRoute.value.fullPath },
 			}
 		},
 	},
diff --git a/src/router/index.ts b/src/router/index.ts
index f3536d6d9..a38e80db7 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -16,7 +16,7 @@ import DataExportDownload from '../views/user/DataExportDownload.vue'
 import ShowTasksInRangeComponent from '../views/tasks/ShowTasksInRange.vue'
 import LinkShareAuthComponent from '../views/sharing/LinkSharingAuth.vue'
 import ListNamespaces from '../views/namespaces/ListNamespaces.vue'
-import TaskDetailViewModal from '../views/tasks/TaskDetailViewModal.vue'
+import TaskDetailView from '../views/tasks/TaskDetailView.vue'
 // Team Handling
 import ListTeamsComponent from '../views/teams/ListTeams.vue'
 // Label Handling
@@ -242,7 +242,7 @@ const router = createRouter({
 		{
 			path: '/tasks/:id',
 			name: 'task.detail',
-			component: TaskDetailViewModal,
+			component: TaskDetailView,
 			props: route => ({ taskId: parseInt(route.params.id as string) }),
 		},
 		{
diff --git a/src/views/list/ListTable.vue b/src/views/list/ListTable.vue
index 6f07a4976..4fc9dd591 100644
--- a/src/views/list/ListTable.vue
+++ b/src/views/list/ListTable.vue
@@ -181,7 +181,6 @@
 
 <script setup lang="ts">
 import { toRef, computed, Ref } from 'vue'
-import { useRouter } from 'vue-router'
 
 import { useStorage } from '@vueuse/core'
 
@@ -273,14 +272,15 @@ function sort(property : keyof SortBy) {
 	}
 }
 
-const router = useRouter()
+// TODO: re-enable opening task detail in modal
+// const router = useRouter()
 const taskDetailRoutes = computed(() => Object.fromEntries(
 	tasks.value.map(({id}) => ([
 		id,
 		{
 			name: 'task.detail',
 			params: { id },
-			state: { backdropView: router.currentRoute.value.fullPath },
+			// state: { backdropView: router.currentRoute.value.fullPath },
 		},
 	])),
 ))
diff --git a/src/views/tasks/TaskDetailViewModal.vue b/src/views/tasks/TaskDetailViewModal.vue
index 9c5d05e4d..f068d9305 100644
--- a/src/views/tasks/TaskDetailViewModal.vue
+++ b/src/views/tasks/TaskDetailViewModal.vue
@@ -4,10 +4,10 @@
 		variant="scrolling"
 		class="task-detail-view-modal"
 	>
-		<a @click="close()" class="close">
+		<BaseButton @click="close()" class="close">
 			<icon icon="times"/>
-		</a>
-		<task-detail-view :task-id="props.taskId"/>
+		</BaseButton>
+		<slot />
 	</modal>
 </template>
 
@@ -15,14 +15,7 @@
 import {computed} from 'vue'
 import {useRouter, useRoute} from 'vue-router'
 
-import TaskDetailView from './TaskDetailView.vue'
-
-const props = defineProps({
-	taskId: {
-		type: Number,
-		required: true,
-	},
-})
+import BaseButton from '@/components/base/BaseButton.vue'
 
 const route = useRoute()
 const historyState = computed(() => route.fullPath && window.history.state)