diff --git a/src/components/overview/AgendaView.vue b/src/components/overview/AgendaView.vue
index 1af084a..2df0202 100644
--- a/src/components/overview/AgendaView.vue
+++ b/src/components/overview/AgendaView.vue
@@ -144,6 +144,7 @@ export default defineComponent({
     }
 
     onBeforeMount(async () => {
+      await router.replace({ query: { ...route.query, q_tab: 'agendaView' } });
       if (!Object.keys(route.query).includes('q_date')) {
         const q_date = date.formatDate(selectedDate.value, 'YYYY-MM-DD');
         await router.replace({ query: { ...route.query, q_date } });
diff --git a/src/pages/EventManagement.vue b/src/pages/EventManagement.vue
index 76fa548..e1c0c1f 100644
--- a/src/pages/EventManagement.vue
+++ b/src/pages/EventManagement.vue
@@ -44,7 +44,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue';
+import { computed, defineComponent, ref, onBeforeMount, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import ManageTypes from '../components/management/ManageTypes.vue';
 import EditEvent from '../components/management/EditEvent.vue';
 import { hasPermission } from '@flaschengeist/api';
@@ -70,6 +71,21 @@ export default defineComponent({
         : []),
     ]);
 
+    const route = useRoute();
+    const router = useRouter();
+
+    onBeforeMount(async () => {
+      if (
+        (route.query.q_tab && route.query.q_tab === 'create') ||
+        route.query.q_tab === 'jobtypes' ||
+        route.query.q_tab === 'eventtypes'
+      ) {
+        tab.value = route.query.q_tab;
+      } else {
+        await router.replace({ query: { q_tab: tab.value } });
+      }
+    });
+
     const drawer = ref<boolean>(false);
     const tab = ref<string>('create');
 
@@ -82,6 +98,10 @@ export default defineComponent({
       },
     });
 
+    watch(tab, async (val) => {
+      await router.replace({ query: { q_tab: val } });
+    });
+
     return {
       showDrawer,
       tab,
diff --git a/src/pages/EventOverview.vue b/src/pages/EventOverview.vue
index 057b97a..4305898 100644
--- a/src/pages/EventOverview.vue
+++ b/src/pages/EventOverview.vue
@@ -43,7 +43,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onBeforeMount } from 'vue';
+import { computed, defineComponent, ref, onBeforeMount, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import AgendaView from '../components/overview/AgendaView.vue';
 import ListView from '../components/overview/ListView.vue';
@@ -55,8 +56,19 @@ export default defineComponent({
   components: { AgendaView, ListView },
   setup() {
     const store = useEventStore();
-    onBeforeMount(() => {
+    const route = useRoute();
+    const router = useRouter();
+    const tab = ref<string>('agendaView');
+    onBeforeMount(async () => {
       void store.getJobTypes();
+      if (
+        Object.keys(route.query).includes('q_tab') &&
+        (route.query.q_tab === 'listView' || route.query.q_tab === 'agendaView')
+      ) {
+        tab.value = route.query.q_tab as string;
+      } else {
+        await router.replace({ query: { ...route.query, q_tab: tab.value } });
+      }
     });
     const quasar = useQuasar();
 
@@ -74,7 +86,10 @@ export default defineComponent({
       },
     });
 
-    const tab = ref<string>('agendaView');
+    watch(tab, async (val) => {
+      console.log(val);
+      await router.replace({ query: { ...route.query, q_tab: val } });
+    });
 
     return {
       showDrawer,