diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index b746131..945e2bc 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -230,6 +230,13 @@ fn main() -> Result<(), ArgsError> {
         gamebanana::list_submissions,
         gamebanana::list_mods
       ])
+      .on_window_event(|event| match event.event() {
+        tauri::WindowEvent::CloseRequested { api, .. } => {
+          // Ensure all proxy stuff is handled
+          disconnect();
+        }
+        _ => {}
+      })
       .run(tauri::generate_context!())
       .expect("error while running tauri application");
   } else {