diff --git a/client/app/components/ClientRow.vue b/client/app/components/ClientRow.vue
index 29df9b0..620393f 100644
--- a/client/app/components/ClientRow.vue
+++ b/client/app/components/ClientRow.vue
@@ -27,7 +27,7 @@
         <PrimeBadge v-if="isMe" severity="secondary" value="You" size="small" class="shrink-0" />
       </div>
 
-      <Component :is="expanded ? ChevronUp : ChevronDown" v-if="!isMe" :size="20" />
+      <Component :is="expanded ? ChevronUp : ChevronDown" v-if="!isMe" :size="20" class="text-muted-color" />
     </div>
 
     <CollapseTransition v-if="!isMe">
diff --git a/client/app/composables/use-app.ts b/client/app/composables/use-app.ts
index b59c15d..3e0a901 100644
--- a/client/app/composables/use-app.ts
+++ b/client/app/composables/use-app.ts
@@ -12,7 +12,17 @@ export const useApp = createGlobalState(() => {
   const ready = ref(false)
   const isTauri = computed(() => '__TAURI_INTERNALS__' in window)
   const commitSha = __COMMIT_SHA__
-  const version = computedAsync(() => isTauri.value ? getVersion() : 'web', '-')
+  const version = computedAsync(() => {
+    if (import.meta.dev) {
+      return 'dev'
+    }
+    else if (isTauri.value) {
+      return getVersion()
+    }
+    else {
+      return 'web'
+    }
+  }, '-')
 
   const inputMuted = computed(() => {
     return !!mediasoup.micProducer.value?.paused
diff --git a/client/app/composables/use-fullscreen-video.ts b/client/app/composables/use-fullscreen-video.ts
index 61182ad..d65780b 100644
--- a/client/app/composables/use-fullscreen-video.ts
+++ b/client/app/composables/use-fullscreen-video.ts
@@ -29,11 +29,25 @@ export const useFullscreenVideo = createGlobalState(() => {
       videoEl.value = el
     }
 
+    stream.getTracks().forEach(t =>
+      t.addEventListener('ended', hide),
+    )
+    videoEl.value.addEventListener('ended', hide)
+
     await videoEl.value.requestFullscreen()
   }
 
   function hide() {
+    if (!videoEl.value)
+      return
+
+    (videoEl.value.srcObject as MediaStream).getTracks().forEach(t =>
+      t.removeEventListener('ended', hide),
+    )
+    videoEl.value.removeEventListener('ended', hide)
+
     videoEl.value?.remove()
+    videoEl.value = undefined
   }
 
   useEventListener(document, 'fullscreenchange', () => {
diff --git a/client/app/layouts/default.vue b/client/app/layouts/default.vue
index f22ae1a..bdf9e33 100644
--- a/client/app/layouts/default.vue
+++ b/client/app/layouts/default.vue
@@ -4,7 +4,7 @@
       class="flex items-center justify-between gap-2 rounded-xl p-3 bg-surface-950"
     >
       <div class="inline-flex items-center gap-3">
-        <PrimeBadge v-if="isTauri" class="opacity-50" severity="secondary" :value="version" size="small" />
+        <PrimeBadge class="opacity-50" severity="secondary" :value="version" size="small" />
         <PrimeBadge :severity="connected ? 'success' : 'danger' " />
       </div>
 
@@ -72,7 +72,6 @@ import {
 } from 'lucide-vue-next'
 
 const {
-  isTauri,
   version,
   clients,
   inputMuted,
diff --git a/client/src-tauri/tauri.conf.json b/client/src-tauri/tauri.conf.json
index 97ad656..a3a6d3d 100644
--- a/client/src-tauri/tauri.conf.json
+++ b/client/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "chad",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "identifier": "xyz.koptilnya.chad",
   "build": {
     "frontendDist": "../.output/public",