diff --git a/resources/ts/App.vue b/resources/ts/App.vue
index 559a184..ce0ed18 100644
--- a/resources/ts/App.vue
+++ b/resources/ts/App.vue
@@ -27,7 +27,8 @@ onMounted(() => {
                 <div
                     class="max-w-md min-w-96 bg-base-100 rounded-box shadow-md p-4"
                 >
-                    <h1
+                    <router-link
+                        to="/"
                         class="text-4xl font-bold opacity-60 tracking-wide select-none"
                     >
                         <list-todo-icon
@@ -36,7 +37,7 @@ onMounted(() => {
                             class="inline"
                         />
                         Tout Doux
-                    </h1>
+                    </router-link>
                     <router-view />
                 </div>
             </div>
diff --git a/resources/ts/lib/lists.ts b/resources/ts/lib/lists.ts
deleted file mode 100644
index f874f33..0000000
--- a/resources/ts/lib/lists.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { getCookie, setCookie } from "@/lib/cookies";
-
-const COOKIE_NAME = "recent-lists";
-const MAX_RECENT_LISTS = 32;
-
-export function getRecentLists(): string[] {
-    const rawData = getCookie(COOKIE_NAME, "");
-    if (!rawData) {
-        return [];
-    }
-    return rawData.split(",");
-}
-
-export function saveRecentList(list: string): void {
-    const recentLists = [list]
-        .concat(getRecentLists())
-        .filter((v, i, a) => a.indexOf(v) === i)
-        .slice(0, MAX_RECENT_LISTS);
-    setCookie(COOKIE_NAME, recentLists.join(","));
-}
diff --git a/resources/ts/stores/lists.ts b/resources/ts/stores/lists.ts
new file mode 100644
index 0000000..01a68ed
--- /dev/null
+++ b/resources/ts/stores/lists.ts
@@ -0,0 +1,25 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+import { getCookie, setCookie } from "@/lib/cookies";
+
+const COOKIE_NAME = "recent-lists";
+const MAX_RECENT_LISTS = 32;
+
+export const useListStore = defineStore("lists", () => {
+    const lists = ref<string[]>([]);
+
+    const rawData = getCookie(COOKIE_NAME, "");
+    if (rawData) {
+        lists.value = rawData.split(",");
+    }
+
+    function addList(list: string) {
+        lists.value = [list]
+            .concat(lists.value)
+            .filter((v, i, a) => a.indexOf(v) === i)
+            .slice(0, MAX_RECENT_LISTS);
+        setCookie(COOKIE_NAME, lists.value.join(","));
+    }
+
+    return { lists, addList };
+});
diff --git a/resources/ts/views/HomeView.vue b/resources/ts/views/HomeView.vue
index 26a07c2..09a28bb 100644
--- a/resources/ts/views/HomeView.vue
+++ b/resources/ts/views/HomeView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { getRecentLists } from "@/lib/lists";
+import { useListStore } from "@/stores/lists";
 import { ArrowBigRightDashIcon, DicesIcon, HistoryIcon } from "@lucide/vue";
 import { generateSlug } from "random-word-slugs";
 import { defineAsyncComponent, onBeforeMount, ref } from "vue";
@@ -9,7 +9,8 @@ const RecentItem = defineAsyncComponent(
 );
 
 const listNameInput = ref<string>(generateSlug(4));
-const recentLists = ref<string[]>(getRecentLists());
+
+const { lists: recentLists } = useListStore();
 
 function onRandom() {
     listNameInput.value = generateSlug(4);
diff --git a/resources/ts/views/ListView.vue b/resources/ts/views/ListView.vue
index b6f5f34..eaec35f 100644
--- a/resources/ts/views/ListView.vue
+++ b/resources/ts/views/ListView.vue
@@ -19,9 +19,9 @@ import { SortType } from "@/enums";
 import { booleanCookieRef, enumCookieRef } from "@/lib/cookies";
 import { useAlertStore } from "@/stores/alerts";
 import { useI18n } from "vue-i18n";
-import { onBeforeRouteUpdate, useRoute } from "vue-router";
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute } from "vue-router";
 import { shareLink } from "@/lib/share";
-import { saveRecentList } from "@/lib/lists";
+import { useListStore } from "@/stores/lists";
 
 const route = useRoute();
 
@@ -29,6 +29,7 @@ const list = ref<string | null>(null);
 const loading = ref<boolean>(true);
 const taskInput = ref<string>("");
 const tasks = ref<Task[]>([]);
+const refreshTimeout = ref<number>(0);
 
 const sortType = enumCookieRef<SortType>("sSortType", SortType.CREATED_AT);
 const sortReverse = booleanCookieRef("sortReverse", false);
@@ -49,18 +50,21 @@ const allCompleted = computed<boolean>(
 const i18n = useI18n();
 
 const { alertSuccess, alertError, alertWarning } = useAlertStore();
+const { addList } = useListStore();
 
-function fetchTasks() {
-    if (list.value) {
+function fetchTasks(requestedList: string) {
+    const initialList = list.value;
+    if (list.value === requestedList) {
         getTasks(list.value)
             .then((data: Task[]) => {
-                tasks.value = data;
-                reSortTasks();
-                loading.value = false;
-                if (data.length && list.value) {
-                    saveRecentList(list.value);
+                if (list.value === initialList) {
+                    tasks.value = data;
+                    reSortTasks(true);
+                    loading.value = false;
+                    refreshTimeout.value = setTimeout(() => {
+                        fetchTasks(list.value ?? "");
+                    }, 10000);
                 }
-                setTimeout(fetchTasks, 10000);
             })
             .catch(() => {
                 if (tasks.value.length !== 0) {
@@ -72,9 +76,14 @@ function fetchTasks() {
     }
 }
 
-function reSortTasks() {
+function reSortTasks(update = false) {
     tasks.value = sortTasks(tasks.value, sortType.value, sortReverse.value);
-    updateTitle();
+    if (update) {
+        updateTitle();
+        if (tasks.value.length && list.value) {
+            addList(list.value);
+        }
+    }
 }
 
 function onNewTask() {
@@ -85,7 +94,7 @@ function onNewTask() {
         })
             .then((data: Task) => {
                 tasks.value.push(data);
-                reSortTasks();
+                reSortTasks(true);
                 alertSuccess(i18n.t("alerts.task_created"));
             })
             .catch(() => {
@@ -97,6 +106,10 @@ function onNewTask() {
     }
 }
 
+function onUpdateTask() {
+    reSortTasks(true);
+}
+
 function onCloneTask(task: Task) {
     if (list.value) {
         createTask(list.value, {
@@ -105,6 +118,7 @@ function onCloneTask(task: Task) {
         })
             .then((data: Task) => {
                 tasks.value.push(data);
+                reSortTasks(true);
                 alertSuccess(i18n.t("alerts.task_cloned"));
             })
             .catch(() => {
@@ -116,6 +130,7 @@ function onCloneTask(task: Task) {
 function onDeleteTask(task: Task) {
     deleteTask(task.id)
         .then(() => {
+            reSortTasks(true);
             alertSuccess(i18n.t("alerts.task_deleted"));
         })
         .catch(() => {
@@ -159,12 +174,16 @@ function updateTitle() {
 
 onBeforeMount(() => {
     list.value = (route.params.list as string).slice(0, 128);
-    fetchTasks();
+    fetchTasks(list.value);
 });
 
 onBeforeRouteUpdate((to) => {
     list.value = (to.params.list as string).slice(0, 128);
-    fetchTasks();
+    fetchTasks(list.value);
+});
+
+onBeforeRouteLeave(() => {
+    clearTimeout(refreshTimeout.value);
 });
 </script>
 
@@ -183,7 +202,10 @@ onBeforeRouteUpdate((to) => {
                 :stroke-width="1"
         /></span>
     </div>
-    <div v-if="!loading && empty" class="mt-4 mb-4 italic text-xl font-extralight">
+    <div
+        v-if="!loading && empty"
+        class="mt-4 mb-4 italic text-xl font-extralight"
+    >
         <search-icon class="inline" />
         <span v-html="$t('empty_hint')"></span>
     </div>
@@ -201,7 +223,7 @@ onBeforeRouteUpdate((to) => {
                     v-model="tasks[i]"
                     :show-last-checked="showLastChecked"
                     :show-next-reset="showNextReset"
-                    @updated="updateTitle"
+                    @updated="onUpdateTask"
                     @clone="onCloneTask"
                     @delete="onDeleteTask"
                 />