diff --git a/src/App.tsx b/src/App.tsx
index a0ceba7..62b16b0 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -259,7 +259,7 @@ export default function App({ children }: { children: React.ReactNode }) {
             try {
                 const isFlatpak = await invoke<boolean>('is_flatpak');
                 const command = isFlatpak
-                ? Command.create('yt-dlp', [' --version'])
+                ? Command.create('sh', ['-c', `yt-dlp --version`])
                 : Command.sidecar('binaries/yt-dlp', ['--version']);
                 const output = await command.execute();
                 if (output.code === 0) {
diff --git a/src/helpers/use-downloader.ts b/src/helpers/use-downloader.ts
index eef8a9c..1fb44b5 100644
--- a/src/helpers/use-downloader.ts
+++ b/src/helpers/use-downloader.ts
@@ -198,7 +198,7 @@ export default function useDownloader() {
 
             const isFlatpak = await invoke<boolean>('is_flatpak');
             const command = isFlatpak
-            ? Command.create('yt-dlp', args)
+            ? Command.create('sh', ['-c', `yt-dlp ${args.map(arg => arg.includes(' ') ? `"${arg}"` : arg).join(' ')}`])
             : Command.sidecar('binaries/yt-dlp', args);
 
             let jsonOutput = '';
@@ -562,7 +562,7 @@ export default function useDownloader() {
         console.log('Starting download with args:', args);
         const isFlatpak = await invoke<boolean>('is_flatpak');
         const command = isFlatpak
-        ? Command.create('yt-dlp', args)
+        ? Command.create('sh', ['-c', `yt-dlp ${args.map(arg => arg.includes(' ') ? `"${arg}"` : arg).join(' ')}`])
         : Command.sidecar('binaries/yt-dlp', args);
 
         command.on('close', async (data) => {