diff --git a/webui/src/components/display/BlobPreview.svelte b/webui/src/components/display/BlobPreview.svelte
index 543e92e..a3e10cf 100644
--- a/webui/src/components/display/BlobPreview.svelte
+++ b/webui/src/components/display/BlobPreview.svelte
@@ -12,12 +12,12 @@
 
   $: mimeType = String($entity?.get("FILE_MIME"));
 
-  $: audio = ["audio", "application/x-riff"].some((p) =>
-    mimeType.startsWith(p)
-  );
-  $: video = ["video", "application/x-matroska"].some((p) =>
-    mimeType.startsWith(p)
-  );
+  $: audio =
+    ["audio", "application/x-riff"].some((p) => mimeType.startsWith(p)) &&
+    !video;
+  $: video =
+    ["video", "application/x-matroska"].some((p) => mimeType.startsWith(p)) ||
+    $entity?.identify().some((l) => l.endsWith(".avi"));
   $: image = mimeType.startsWith("image");
   $: text = mimeType.startsWith("text");
   $: pdf = mimeType.startsWith("application/pdf");
diff --git a/webui/src/components/display/BlobViewer.svelte b/webui/src/components/display/BlobViewer.svelte
index 5368c77..53fb5e4 100644
--- a/webui/src/components/display/BlobViewer.svelte
+++ b/webui/src/components/display/BlobViewer.svelte
@@ -19,12 +19,12 @@
 
   $: mimeType = String($entity?.get("FILE_MIME"));
 
-  $: audio = ["audio", "application/x-riff"].some((p) =>
-    mimeType.startsWith(p)
-  );
-  $: video = ["video", "application/x-matroska"].some((p) =>
-    mimeType.startsWith(p)
-  );
+  $: audio =
+    ["audio", "application/x-riff"].some((p) => mimeType.startsWith(p)) &&
+    !video;
+  $: video =
+    ["video", "application/x-matroska"].some((p) => mimeType.startsWith(p)) ||
+    $entity?.identify().some((l) => l.endsWith(".avi"));
   $: image = mimeType.startsWith("image");
   $: text = mimeType.startsWith("text");
   $: pdf = mimeType.startsWith("application/pdf");
diff --git a/webui/src/components/display/blobs/VideoViewer.svelte b/webui/src/components/display/blobs/VideoViewer.svelte
index 2225dbc..9ea6b1b 100644
--- a/webui/src/components/display/blobs/VideoViewer.svelte
+++ b/webui/src/components/display/blobs/VideoViewer.svelte
@@ -53,7 +53,7 @@
       <Spinner />
       <img
         class="thumb"
-        src="api/thumb/{address}"
+        src="api/thumb/{address}?mime=video"
         alt="Preview for {address}"
         on:load={() => (state = State.PREVIEW)}
         on:error={() => (state = State.ERRORED)}
@@ -63,7 +63,7 @@
       <video
         preload={detail ? "auto" : "metadata"}
         src="api/raw/{address}"
-        poster="api/thumb/{address}"
+        poster="api/thumb/{address}?mime=video"
         on:mousemove={updatePreviewPosition}
         on:mouseleave={resetPreview}
         on:click={startPlaying}