diff --git a/PlaylistDownloader.exe b/PlaylistDownloader.exe
index fe34856..0d04e6e 100644
Binary files a/PlaylistDownloader.exe and b/PlaylistDownloader.exe differ
diff --git a/PlaylistDownloader.zip b/PlaylistDownloader.zip
index 81aa929..b4382f1 100644
Binary files a/PlaylistDownloader.zip and b/PlaylistDownloader.zip differ
diff --git a/PlaylistDownloader/Installer/InnoPlaylistDownloaderInstallerScript.iss b/PlaylistDownloader/Installer/InnoPlaylistDownloaderInstallerScript.iss
index 7b358c2..52d082a 100644
--- a/PlaylistDownloader/Installer/InnoPlaylistDownloaderInstallerScript.iss
+++ b/PlaylistDownloader/Installer/InnoPlaylistDownloaderInstallerScript.iss
@@ -7,8 +7,8 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{B0011CEC-2AE2-40CF-9136-C2BD13928896}
 AppName=PlaylistDownloader
-AppVersion=1.8
-AppVerName=PlaylistDownloader 1.8
+AppVersion=1.9.3
+AppVerName=PlaylistDownloader 1.9.3
 AppPublisher=Taxrebel productions
 AppPublisherURL=https://github.com/bertyhell/PlaylistDownloader
 AppSupportURL=https://github.com/bertyhell/PlaylistDownloader
diff --git a/PlaylistDownloader/PlaylistDownloader/DownloadWindow.xaml.cs b/PlaylistDownloader/PlaylistDownloader/DownloadWindow.xaml.cs
index d803a22..92365e9 100644
--- a/PlaylistDownloader/PlaylistDownloader/DownloadWindow.xaml.cs
+++ b/PlaylistDownloader/PlaylistDownloader/DownloadWindow.xaml.cs
@@ -132,7 +132,10 @@ private void DownloaderProgressChanged(object sender, ProgressChangedEventArgs e
 
         private void ButtonOpenFolderClick(object sender, RoutedEventArgs e)
         {
-            Directory.CreateDirectory(_runSettings.SongsFolder);
+            if (!Directory.Exists(_runSettings.SongsFolder))
+            {
+                Directory.CreateDirectory(_runSettings.SongsFolder);
+            }
             Process.Start(_runSettings.SongsFolder);
         }
 
diff --git a/PlaylistDownloader/PlaylistDownloader/SettingsWindow.xaml.cs b/PlaylistDownloader/PlaylistDownloader/SettingsWindow.xaml.cs
index 0354061..2019199 100644
--- a/PlaylistDownloader/PlaylistDownloader/SettingsWindow.xaml.cs
+++ b/PlaylistDownloader/PlaylistDownloader/SettingsWindow.xaml.cs
@@ -140,11 +140,17 @@ private RunSettings InitializeRunSettings()
                 }
             }
 
+            var outputPath = Properties.Settings.Default.OutputPath;
+            if (outputPath == null || outputPath == "")
+            {
+                outputPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), "PlaylistDownloader");
+            }
+
             var settings = new RunSettings
             {
                 YoutubeDlPath = Properties.Settings.Default.YoutubeDlPath,
                 FfmpegPath = Properties.Settings.Default.FfmpegPath,
-                SongsFolder = Properties.Settings.Default.OutputPath
+                SongsFolder = outputPath
             };
 
             settings.IsDebug = _isDebugMode;
@@ -323,7 +329,11 @@ private void ButtonSearchClick(object sender, RoutedEventArgs e)
 
         private void ButtonOpenFolderClick(object sender, RoutedEventArgs e)
         {
-            Directory.CreateDirectory(_runSettings.SongsFolder);
+
+            if (!Directory.Exists(_runSettings.SongsFolder))
+            {
+                Directory.CreateDirectory(_runSettings.SongsFolder);
+            }
             Process.Start(_runSettings.SongsFolder);
         }
 
diff --git a/README.md b/README.md
index 4529669..644dc9b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-PlaylistDownloader 1.9.2
+PlaylistDownloader 1.9.3
 ========================
 
 Download your whole playlist with one click of a button