diff --git a/Desktop.Win.Wrapper/MainWindow.xaml.cs b/Desktop.Win.Wrapper/MainWindow.xaml.cs
index cf4328de..4ca7635c 100644
--- a/Desktop.Win.Wrapper/MainWindow.xaml.cs
+++ b/Desktop.Win.Wrapper/MainWindow.xaml.cs
@@ -51,20 +51,12 @@ namespace Remotely.Desktop.Win.Wrapper
 
         private async void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            var sha1 = SHA1.Create().ComputeHash(File.ReadAllBytes(Assembly.GetExecutingAssembly().Location));
-            var sha1Base64 = Convert.ToBase64String(sha1);
-            tempDir = Directory.CreateDirectory(PathIO.Combine(baseDir, sha1Base64)).FullName;
-
+            StatusText.Text = "Extracting files...";
             await Task.Run(CleanupOldFiles);
-
-            if (!File.Exists(PathIO.Combine(tempDir, $"{Assembly.GetExecutingAssembly().GetName().Name}.exe")))
-            {
-                StatusText.Text = "Extracting files...";
-                await Task.Run(ExtractRemotely);
-                await Task.Run(ExtractInstallScript);
-                StatusText.Text = "Updating .NET Core runtime...";
-            }
-
+            tempDir = Directory.CreateDirectory(PathIO.Combine(baseDir, Guid.NewGuid().ToString())).FullName;
+            await Task.Run(ExtractRemotely);
+            await Task.Run(ExtractInstallScript);
+            StatusText.Text = "Updating .NET Core runtime...";
             await Task.Run(RunInstallScript);
             Close();
         }