diff --git a/frontend/components/DirectoryEntry.vue b/frontend/components/DirectoryEntry.vue
index a35b774..1f2f73d 100644
--- a/frontend/components/DirectoryEntry.vue
+++ b/frontend/components/DirectoryEntry.vue
@@ -61,7 +61,7 @@ async function onClick() {
     <ContextMenu>
         <ContextMenuTrigger>
             <button
-                :disabled="warrenStore.loading"
+                :disabled="warrenStore.loading || disabled"
                 :class="[
                     'bg-accent/30 border-border flex w-52 flex-row gap-4 overflow-hidden rounded-md border-1 px-4 py-2 select-none',
                     {
diff --git a/frontend/composables/useWarrenPath.ts b/frontend/composables/useWarrenPath.ts
new file mode 100644
index 0000000..6e06ed6
--- /dev/null
+++ b/frontend/composables/useWarrenPath.ts
@@ -0,0 +1,9 @@
+export function useWarrenPath() {
+    const store = useWarrenStore();
+
+    if (store.current == null) {
+        return null;
+    }
+
+    return `${store.current.warrenId}/${store.current.path}`;
+}
diff --git a/frontend/lib/api/auth/login.ts b/frontend/lib/api/auth/login.ts
index 344b695..8ee764e 100644
--- a/frontend/lib/api/auth/login.ts
+++ b/frontend/lib/api/auth/login.ts
@@ -1,6 +1,5 @@
 import { toast } from 'vue-sonner';
 import type { ApiResponse } from '~/types/api';
-import { getAuthSessionData } from './getSession';
 import type { AuthUser } from '~/types/auth';
 
 export async function loginUser(
diff --git a/frontend/pages/warrens/files.vue b/frontend/pages/warrens/files.vue
index 9adb1dc..cef418b 100644
--- a/frontend/pages/warrens/files.vue
+++ b/frontend/pages/warrens/files.vue
@@ -1,9 +1,7 @@
 <script setup lang="ts">
-import { computedAsync } from '@vueuse/core';
 import DirectoryListContextMenu from '~/components/DirectoryListContextMenu.vue';
 import RenameEntryDialog from '~/components/actions/RenameEntryDialog.vue';
 import { getWarrenDirectory } from '~/lib/api/warrens';
-import type { DirectoryEntry } from '~/types';
 
 definePageMeta({
     middleware: ['authenticated'],
@@ -11,6 +9,7 @@ definePageMeta({
 
 const warrenStore = useWarrenStore();
 const loadingIndicator = useLoadingIndicator();
+const warrenPath = computed(() => useWarrenPath());
 
 if (warrenStore.current == null) {
     await navigateTo({
@@ -18,24 +17,28 @@ if (warrenStore.current == null) {
     });
 }
 
-const entries = computedAsync<DirectoryEntry[]>(async () => {
-    if (warrenStore.current == null) {
-        return [];
-    }
+const entries = useAsyncData(
+    'current-directory',
+    async () => {
+        if (warrenStore.current == null) {
+            return [];
+        }
 
-    loadingIndicator.start();
-    warrenStore.loading = true;
+        loadingIndicator.start();
+        warrenStore.loading = true;
 
-    const entries = await getWarrenDirectory(
-        warrenStore.current.warrenId,
-        warrenStore.current.path
-    );
+        const entries = await getWarrenDirectory(
+            warrenStore.current.warrenId,
+            warrenStore.current.path
+        );
 
-    warrenStore.loading = false;
-    loadingIndicator.finish();
+        warrenStore.loading = false;
+        loadingIndicator.finish();
 
-    return entries;
-}, []);
+        return entries;
+    },
+    { watch: [warrenPath] }
+).data;
 </script>
 
 <template>