diff --git a/apps/web/src/components/activities/ActivitiesKanban.vue b/apps/web/src/components/activities/ActivitiesKanban.vue
index 3a24ea0..b3c7d7d 100644
--- a/apps/web/src/components/activities/ActivitiesKanban.vue
+++ b/apps/web/src/components/activities/ActivitiesKanban.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
 import type {
   ActivityDto,
@@ -389,8 +389,15 @@ async function onAddStage(name: string) {
   }
 }
 
+const route = useRoute();
+
 function openActivity(id: string) {
-  void router.push({ name: 'activity-detail', params: { id } });
+  const query: Record<string, string> = {};
+  for (const key of ['board', 'view', 'desk', 'filter', 'stage', 'q', 'typeDefId', 'status', 'assigneeId']) {
+    const value = route.query[key];
+    if (typeof value === 'string' && value) query[key] = value;
+  }
+  void router.push({ name: 'activity-detail', params: { id }, query });
 }
 </script>
 
diff --git a/apps/web/src/views/ActivitiesView.vue b/apps/web/src/views/ActivitiesView.vue
index 39ad5bc..0a1ca9f 100644
--- a/apps/web/src/views/ActivitiesView.vue
+++ b/apps/web/src/views/ActivitiesView.vue
@@ -399,6 +399,19 @@ async function loadStages() {
   }
 }
 
+function activityRoute(id: string, edit = false) {
+  const query: Record<string, string> = {};
+  for (const key of ['board', 'view', 'desk', 'filter', 'stage', 'q', 'typeDefId', 'status', 'assigneeId'] as const) {
+    const value = route.query[key];
+    if (typeof value === 'string' && value) query[key] = value;
+  }
+  return {
+    name: edit ? ('activity-edit' as const) : ('activity-detail' as const),
+    params: { id },
+    query,
+  };
+}
+
 function setBoard(next: string) {
   void router.replace({
     name: 'activities',
@@ -1370,7 +1383,7 @@ onUnmounted(() => {
           <div v-if="colOn('title')" class="title-cell">
             <UiIcon name="star" :size="16" class="star" />
             <div>
-              <RouterLink class="title" :to="{ name: 'activity-detail', params: { id: item.id } }">
+              <RouterLink class="title" :to="activityRoute(item.id)">
                 {{ item.title }}
               </RouterLink>
               <p v-if="subtitle(item)" class="sub">{{ subtitle(item) }}</p>
@@ -1452,10 +1465,10 @@ onUnmounted(() => {
                 </button>
               </template>
               <button type="button" @click="startSelect(item.id)">انتخاب</button>
-              <RouterLink :to="{ name: 'activity-detail', params: { id: item.id } }">
+              <RouterLink :to="activityRoute(item.id)">
                 مشاهده
               </RouterLink>
-              <RouterLink :to="{ name: 'activity-edit', params: { id: item.id } }">
+              <RouterLink :to="activityRoute(item.id, true)">
                 ویرایش
               </RouterLink>
               <button v-if="canPromotePrior(item)" type="button" @click="promotePriorActivity(item.id)">
@@ -1497,7 +1510,7 @@ onUnmounted(() => {
               <time :class="item.type">{{ clockText(item) }}</time>
               <RouterLink
                 class="title"
-                :to="{ name: 'activity-detail', params: { id: item.id } }"
+                :to="activityRoute(item.id)"
                 @click="selectMode && $event.preventDefault()"
               >
                 {{ item.title }}
@@ -1542,10 +1555,10 @@ onUnmounted(() => {
                   </button>
                 </template>
                 <button type="button" @click="startSelect(item.id)">انتخاب</button>
-                <RouterLink :to="{ name: 'activity-detail', params: { id: item.id } }">
+                <RouterLink :to="activityRoute(item.id)">
                   مشاهده
                 </RouterLink>
-                <RouterLink :to="{ name: 'activity-edit', params: { id: item.id } }">
+                <RouterLink :to="activityRoute(item.id, true)">
                   ویرایش
                 </RouterLink>
                 <button v-if="canPromotePrior(item)" type="button" @click="promotePriorActivity(item.id)">
@@ -1601,14 +1614,14 @@ onUnmounted(() => {
         <button type="button" role="menuitem" @click="startSelect(boardMenuId)">انتخاب</button>
         <RouterLink
           role="menuitem"
-          :to="{ name: 'activity-detail', params: { id: boardMenuId } }"
+          :to="activityRoute(boardMenuId)"
           @click="boardMenuId = null; boardMenuActivity = null"
         >
           مشاهده
         </RouterLink>
         <RouterLink
           role="menuitem"
-          :to="{ name: 'activity-edit', params: { id: boardMenuId } }"
+          :to="activityRoute(boardMenuId, true)"
           @click="boardMenuId = null; boardMenuActivity = null"
         >
           ویرایش
diff --git a/apps/web/src/views/ActivityDetailView.vue b/apps/web/src/views/ActivityDetailView.vue
index 05bbaa4..ad1902a 100644
--- a/apps/web/src/views/ActivityDetailView.vue
+++ b/apps/web/src/views/ActivityDetailView.vue
@@ -27,6 +27,26 @@ import { brand } from '@mento/shared';
 
 const route = useRoute();
 const router = useRouter();
+
+const ACTIVITY_LIST_QUERY = ['board', 'view', 'desk', 'filter', 'stage', 'q', 'typeDefId', 'status', 'assigneeId'] as const;
+
+function activitiesListLocation() {
+  const query: Record<string, string> = {};
+  for (const key of ACTIVITY_LIST_QUERY) {
+    const value = route.query[key];
+    if (typeof value === 'string' && value) query[key] = value;
+  }
+  return { name: 'activities' as const, query };
+}
+
+function goBack() {
+  const back = (window.history.state as { back?: string | null } | null)?.back ?? '';
+  if (back.split('?')[0] === '/activities') {
+    router.back();
+    return;
+  }
+  void router.push(activitiesListLocation());
+}
 const auth = useAuthStore();
 const id = computed(() => (typeof route.params.id === 'string' ? route.params.id : ''));
 const canReassign = computed(() => canReassignRecords(auth.user?.role));
@@ -314,9 +334,9 @@ onMounted(() => {
 <template>
   <section class="page" @click="moreOpen = false">
     <header class="nav">
-      <RouterLink class="icon-btn back" :to="{ name: 'activities' }" aria-label="بازگشت">
+      <a class="icon-btn back" href="/activities" aria-label="بازگشت" @click.prevent="goBack">
         <UiIcon name="chevron" :size="18" />
-      </RouterLink>
+      </a>
       <span class="brand">{{ brand.name }}</span>
       <div class="more" @click.stop>
         <button class="icon-btn" type="button" aria-label="منوی بیشتر" @click="moreOpen = !moreOpen">