diff --git a/analysis/src/shared_utils/audio_metadata_reader.rs b/analysis/src/shared_utils/audio_metadata_reader.rs
index a5c16dce8..b58c49f1f 100644
--- a/analysis/src/shared_utils/audio_metadata_reader.rs
+++ b/analysis/src/shared_utils/audio_metadata_reader.rs
@@ -36,14 +36,20 @@ pub fn get_format(file_path: &str) -> Result<Box<dyn FormatReader>> {
 }
 
 pub fn get_codec_information(track: &Track) -> Result<(u32, f64), symphonia::core::errors::Error> {
-    let sample_rate = track
-        .codec_params
-        .sample_rate
-        .ok_or_else(|| symphonia::core::errors::Error::Unsupported("No sample rate found"))?;
-    let duration = track
-        .codec_params
-        .n_frames
-        .ok_or_else(|| symphonia::core::errors::Error::Unsupported("No duration found"))?;
+    let sample_rate =
+        track
+            .codec_params
+            .sample_rate
+            .ok_or(symphonia::core::errors::Error::Unsupported(
+                "No sample rate found",
+            ))?;
+    let duration =
+        track
+            .codec_params
+            .n_frames
+            .ok_or(symphonia::core::errors::Error::Unsupported(
+                "No duration found",
+            ))?;
 
     let time_base = track
         .codec_params
diff --git a/lib/utils/close_manager.dart b/lib/utils/close_manager.dart
index 0e6d9bbfd..51abd903f 100644
--- a/lib/utils/close_manager.dart
+++ b/lib/utils/close_manager.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:bitsdojo_window/bitsdojo_window.dart';
+import 'package:flutter/services.dart';
 import 'package:local_notifier/local_notifier.dart';
 import 'package:flutter_window_close/flutter_window_close.dart';
 
@@ -40,7 +41,12 @@ class CloseManager {
 
   close() {
     forceClose = true;
-    appWindow.close();
+    
+    if (Platform.isMacOS) {
+      SystemNavigator.pop();
+    } else {
+      appWindow.close();
+    }
   }
 }