diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 0d671a1..d918d7d 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -14,6 +14,7 @@ use std::{
     time::Duration,
 };
 use sysinfo::System;
+use tauri::window::{ProgressBarState, ProgressBarStatus};
 use tauri::{AppHandle, Emitter, Manager};
 use tauri_plugin_os::platform;
 use tauri_plugin_prevent_default::Flags;
@@ -135,6 +136,7 @@ async fn download(
     hash: String,
 ) -> String {
     println!("[download] Starting download for '{}' from '{}'", name, url);
+    let window = app.get_webview_window("main").expect("main window missing");
 
     let client = reqwest::Client::new();
     let resp = match client.get(&url).send().await {
@@ -274,6 +276,10 @@ async fn download(
                 eta_secs,
                 chunk_count,
             );
+            let _ = window.set_progress_bar(ProgressBarState {
+                status: Some(ProgressBarStatus::Normal),
+                progress: Some(progress as u64),
+            });
         }
 
         let _ = app.emit(
@@ -292,6 +298,10 @@ async fn download(
             total_size,
             (downloaded as f64 / total_size as f64) * 100.0
         );
+        let _ = window.set_progress_bar(ProgressBarState {
+            status: Some(ProgressBarStatus::None),
+            progress: Some(0),
+        });
         return "-1".to_string();
     }
 
@@ -347,6 +357,10 @@ async fn download(
     if hash != download_hash {
         println!("[download] ERROR: Hash mismatch! File may be corrupt or tampered with.");
         let _ = tokio::fs::remove_file(download_part_path.clone()).await;
+        let _ = window.set_progress_bar(ProgressBarState {
+            status: Some(ProgressBarStatus::None),
+            progress: Some(0),
+        });
         return "-1".to_string();
     }
 
@@ -356,6 +370,10 @@ async fn download(
     println!("[download] Renaming .part -> .zip: {:?}", download_zip_path);
     if let Err(e) = tokio::fs::rename(download_part_path.clone(), download_zip_path.clone()).await {
         println!("[download] ERROR: Failed to rename .part to .zip: {}", e);
+        let _ = window.set_progress_bar(ProgressBarState {
+            status: Some(ProgressBarStatus::None),
+            progress: Some(0),
+        });
         return "-1".to_string();
     }
 
@@ -367,6 +385,10 @@ async fn download(
 
     if unzip_res == "-1" {
         println!("[download] ERROR: Unzip failed for '{}'", name);
+        let _ = window.set_progress_bar(ProgressBarState {
+            status: Some(ProgressBarStatus::None),
+            progress: Some(0),
+        });
         return "-1".to_string();
     }
 
@@ -374,6 +396,10 @@ async fn download(
         "[download] SUCCESS: '{}' downloaded, verified, and extracted",
         name
     );
+    let _ = window.set_progress_bar(ProgressBarState {
+        status: Some(ProgressBarStatus::None),
+        progress: Some(0),
+    });
     return "1".to_string();
 }
 
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 2a7bab2..bb28c6f 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -180,71 +180,80 @@ export default function RootLayout ({
   }, [popupMode, selectedGame, pathname, viewingInfoFromDownloads])
 
   useEffect(() => {
-    let unlistenProgress: (() => void) | null = null
+    const unlisteners: (() => void)[] = []
 
-    listen<string>('download-size', event => {
-      const [displayName, sizeStr] = event.payload.split(':')
-      const size = Number(sizeStr)
-      setDownloadProgress(prev => {
-        const i = prev.findIndex(d => d.version === displayName)
-        if (i === -1) return prev
-        const copy = [...prev]
-        copy[i] = {
-          ...copy[i],
-          size
-        }
-        return copy
-      })
-    }).then(f => (unlistenProgress = f))
+    const setupListeners = async () => {
+      unlisteners.push(
+        await listen<string>('download-size', event => {
+          const [displayName, sizeStr] = event.payload.split(':')
+          const size = Number(sizeStr)
+          setDownloadProgress(prev => {
+            const i = prev.findIndex(d => d.version === displayName)
+            if (i === -1) return prev
+            const copy = [...prev]
+            copy[i] = { ...copy[i], size }
+            return copy
+          })
+        })
+      )
 
-    listen<string>('download-progress', async event => {
-      const [displayName, progStr, totalSizeStr, speedStr, etaSecsStr] =
-        event.payload.split(':')
-      const prog = Number(progStr)
-      const progBytes = Number(totalSizeStr)
-      const speed = Number(speedStr)
-      const etaSecs = Number(etaSecsStr)
-      setDownloadProgress(prev => {
-        const i = prev.findIndex(d => d.version === displayName)
-        if (i === -1) return prev
-        const copy = [...prev]
-        copy[i] = {
-          ...copy[i],
-          progress: prog,
-          progressBytes: progBytes,
-          speed,
-          etaSecs
-        }
-        return copy
-      })
-    }).then(f => (unlistenProgress = f))
+      unlisteners.push(
+        await listen<string>('download-progress', async event => {
+          const [displayName, progStr, totalSizeStr, speedStr, etaSecsStr] =
+            event.payload.split(':')
+          const prog = Number(progStr)
+          const progBytes = Number(totalSizeStr)
+          const speed = Number(speedStr)
+          const etaSecs = Number(etaSecsStr)
+          setDownloadProgress(prev => {
+            const i = prev.findIndex(d => d.version === displayName)
+            if (i === -1) return prev
+            const copy = [...prev]
+            copy[i] = {
+              ...copy[i],
+              progress: prog,
+              progressBytes: progBytes,
+              speed,
+              etaSecs
+            }
+            return copy
+          })
+        })
+      )
 
-    listen<string>('download-hash-checking', event => {
-      const displayName = event.payload
-      setDownloadProgress(prev => {
-        const i = prev.findIndex(d => d.version === displayName)
-        if (i === -1) return prev
-        const copy = [...prev]
-        copy[i] = { ...copy[i], hash_checking: true }
-        return copy
-      })
-    }).then(f => (unlistenProgress = f))
+      unlisteners.push(
+        await listen<string>('download-hash-checking', event => {
+          const displayName = event.payload
+          setDownloadProgress(prev => {
+            const i = prev.findIndex(d => d.version === displayName)
+            if (i === -1) return prev
+            const copy = [...prev]
+            copy[i] = { ...copy[i], hash_checking: true }
+            return copy
+          })
+        })
+      )
 
-    listen<string>('download-finishing', event => {
-      const displayName = event.payload
-      setDownloadProgress(prev => {
-        const i = prev.findIndex(d => d.version === displayName)
-        if (i === -1) return prev
-        const copy = [...prev]
-        copy[i] = { ...copy[i], hash_checking: false, finishing: true }
-        return copy
-      })
-    }).then(f => (unlistenProgress = f))
+      unlisteners.push(
+        await listen<string>('download-finishing', event => {
+          const displayName = event.payload
+          setDownloadProgress(prev => {
+            const i = prev.findIndex(d => d.version === displayName)
+            if (i === -1) return prev
+            const copy = [...prev]
+            copy[i] = { ...copy[i], hash_checking: false, finishing: true }
+            return copy
+          })
+        })
+      )
+    }
+
+    setupListeners()
 
     return () => {
-      unlistenProgress?.()
+      unlisteners.forEach(unlisten => unlisten())
     }
-  }, [downloadProgress])
+  }, [])
 
   useEffect(() => {
     ;(async () => {