diff --git a/src/views/tasks/TaskDetailViewModal.vue b/src/views/tasks/TaskDetailViewModal.vue
index a240a2b09..913ed6593 100644
--- a/src/views/tasks/TaskDetailViewModal.vue
+++ b/src/views/tasks/TaskDetailViewModal.vue
@@ -12,11 +12,22 @@
 </template>
 
 <script setup>
-import TaskDetailView from './TaskDetailView'
-import router from '@/router'
+import {computed} from 'vue'
+import {useRouter, useRoute} from 'vue-router'
 
+import TaskDetailView from './TaskDetailView'
+
+const route = useRoute()
+const historyState = computed(() => route.fullPath && window.history.state)
+
+const router = useRouter()
 function close() {
-	router.back()
+	if (historyState.value) {
+		router.back()
+	} else {
+		const backdropRoute = historyState.value?.backdropView && router.resolve(historyState.value.backdropView)
+		router.push(backdropRoute)
+	}
 }
 </script>