diff --git a/Wabbajack.Lib/MO2Installer.cs b/Wabbajack.Lib/MO2Installer.cs
index 3d19ccd6..52d6909e 100644
--- a/Wabbajack.Lib/MO2Installer.cs
+++ b/Wabbajack.Lib/MO2Installer.cs
@@ -327,7 +327,7 @@ namespace Wabbajack.Lib
             if (!Directory.Exists(path)) return ErrorResponse.Success;
 
             // Check folder does not have a wabbajack modlist
-            foreach (var file in Directory.EnumerateFiles(path, DirectoryEnumerationOptions.Recursive))
+            foreach (var file in Directory.EnumerateFiles(path))
             {
                 if (!File.Exists(file)) continue;
                 if (System.IO.Path.GetExtension(file).Equals(ExtensionManager.Extension))
diff --git a/Wabbajack/View Models/Installers/MO2InstallerVM.cs b/Wabbajack/View Models/Installers/MO2InstallerVM.cs
index 44ac1491..3982a31b 100644
--- a/Wabbajack/View Models/Installers/MO2InstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/MO2InstallerVM.cs	
@@ -58,10 +58,10 @@ namespace Wabbajack
             Location.AdditionalError = Observable.CombineLatest(
                     this.WhenAny(x => x.Location.TargetPath),
                     this.WhenAny(x => x.DownloadLocation.TargetPath),
-                    resultSelector: (target, download) =>
-                    {
-                        return MO2Installer.CheckValidInstallPath(target, download);
-                    });
+                    resultSelector: (target, download) => (target, download))
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Select(i => MO2Installer.CheckValidInstallPath(i.target, i.download))
+                .ObserveOnGuiThread();
 
             CanInstall = Observable.CombineLatest(
                 this.WhenAny(x => x.Location.InError),