diff --git a/src/lib/modules/opfs.ts b/src/lib/modules/opfs.ts
index 8aedc43..5ac70da 100644
--- a/src/lib/modules/opfs.ts
+++ b/src/lib/modules/opfs.ts
@@ -17,7 +17,7 @@ const getFileHandle = async (path: string, create = true) => {
   }
 
   try {
-    let directoryHandle: FileSystemDirectoryHandle = rootHandle;
+    let directoryHandle = rootHandle;
     for (const part of parts.slice(0, -1)) {
       if (!part) continue;
       directoryHandle = await directoryHandle.getDirectoryHandle(part, { create });
diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte
index 15c4571..6188520 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -4,7 +4,7 @@
   import { get, type Writable } from "svelte/store";
   import { TopBar } from "$lib/components";
   import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
-  import { fileDownloadStatusStore, masterKeyStore } from "$lib/stores";
+  import { fileDownloadStatusStore, isFileDownloading, masterKeyStore } from "$lib/stores";
   import DownloadStatus from "./DownloadStatus.svelte";
   import { requestFileDownload } from "./service";
 
@@ -14,14 +14,8 @@
 
   const downloadStatus = $derived(
     $fileDownloadStatusStore.find((statusStore) => {
-      const status = get(statusStore);
-      return (
-        status.id === data.id &&
-        (status.status === "download-pending" ||
-          status.status === "downloading" ||
-          status.status === "decryption-pending" ||
-          status.status === "decrypting")
-      );
+      const { id, status } = get(statusStore);
+      return id === data.id && isFileDownloading(status);
     }),
   );
 
diff --git a/src/routes/(main)/directory/[[id]]/service.ts b/src/routes/(main)/directory/[[id]]/service.ts
index d635c17..c9a62b2 100644
--- a/src/routes/(main)/directory/[[id]]/service.ts
+++ b/src/routes/(main)/directory/[[id]]/service.ts
@@ -1,7 +1,7 @@
 import { callGetApi, callPostApi } from "$lib/hooks";
 import { storeHmacSecrets } from "$lib/indexedDB";
-import { deleteFileCache, uploadFile } from "$lib/modules/file";
 import { generateDataKey, wrapDataKey, unwrapHmacSecret, encryptString } from "$lib/modules/crypto";
+import { deleteFileCache, uploadFile } from "$lib/modules/file";
 import type {
   DirectoryRenameRequest,
   DirectoryCreateRequest,
diff --git a/src/routes/(main)/menu/+page.svelte b/src/routes/(main)/menu/+page.svelte
index 5ca21b5..13ccb92 100644
--- a/src/routes/(main)/menu/+page.svelte
+++ b/src/routes/(main)/menu/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
   import MenuEntryButton from "./MenuEntryButton.svelte";
-  import { requestLogout } from "./service.js";
+  import { requestLogout } from "./service";
 
   import IconStorage from "~icons/material-symbols/storage";
   import IconPassword from "~icons/material-symbols/password";
diff --git a/src/routes/(main)/menu/MenuEntryButton.svelte b/src/routes/(main)/menu/MenuEntryButton.svelte
index 9fd64c8..eb236c9 100644
--- a/src/routes/(main)/menu/MenuEntryButton.svelte
+++ b/src/routes/(main)/menu/MenuEntryButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Component, Snippet } from "svelte";
-  import { EntryButton } from "$lib/components/buttons";
   import type { SvelteHTMLElements } from "svelte/elements";
+  import { EntryButton } from "$lib/components/buttons";
 
   interface Props {
     children: Snippet;