diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85f89f62..057eb8d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 * Supress slide load failures
 * Setup Crash handling at the very start of the app
 * Add BA2 support
+* Fix Downloads folder being incorrectly detected in some cases
+* Fix validation error on selecting an installation directory in Install mode
 
 #### Version 0.9.4 - 10/2/2019
 * Point github icon to https://github.com/wabbajack-tools/wabbajack
diff --git a/Compression.BSA/packages.config b/Compression.BSA/packages.config
index a47026cb..4d29cdb4 100644
--- a/Compression.BSA/packages.config
+++ b/Compression.BSA/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
   <package id="K4os.Compression.LZ4" version="1.1.11" targetFramework="net472" />
diff --git a/VirtualFileSystem/packages.config b/VirtualFileSystem/packages.config
index cfd09870..a49a0ac7 100644
--- a/VirtualFileSystem/packages.config
+++ b/VirtualFileSystem/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
diff --git a/Wabbajack/AppState.cs b/Wabbajack/AppState.cs
index 6ecc34ab..00e21dcb 100644
--- a/Wabbajack/AppState.cs
+++ b/Wabbajack/AppState.cs
@@ -1,4 +1,5 @@
-using System;
+using Syroot.Windows.IO;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -47,12 +48,13 @@ namespace Wabbajack
 
             _slideShow = new SlideShow(this, true);
 
-            if (Assembly.GetEntryAssembly().Location.ToLower().Contains("\\downloads\\"))
+
+            if (Path.GetDirectoryName(Assembly.GetEntryAssembly().Location.ToLower()) == KnownFolders.Downloads.Path.ToLower())
             {
                 MessageBox.Show(
-                    "This app seems to be running inside a folder called 'Downloads', such folders are often highly monitored by antivirus software and they can often " +
-                    "conflict with the operations Wabbajack needs to perform. Please move this executable outside of your 'Downloads' folder and then restart the app.",
-                    "Cannot run inside 'Downloads'",
+                    "Wabbajack is running inside your Downloads folder. This folder is often highly monitored by antivirus software and these can often " +
+                    "conflict with the operations Wabbajack needs to perform. Please move this executable outside of your Downloads folder and then restart the app.",
+                    "Cannot run inside Downloads",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
                 Environment.Exit(1);
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 4557dd5d..6fb227c4 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -135,6 +135,9 @@
     <Reference Include="SharpCompress, Version=0.23.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpCompress.0.23.0\lib\net45\SharpCompress.dll</HintPath>
     </Reference>
+    <Reference Include="Syroot.KnownFolders, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Syroot.Windows.IO.KnownFolders.1.2.1\lib\net452\Syroot.KnownFolders.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
diff --git a/Wabbajack/packages.config b/Wabbajack/packages.config
index 48d6efbc..585b4214 100644
--- a/Wabbajack/packages.config
+++ b/Wabbajack/packages.config
@@ -16,6 +16,7 @@
   <package id="protobuf-net" version="2.4.0" targetFramework="net472" />
   <package id="SharpCompress" version="0.23.0" targetFramework="net472" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net472" />
+  <package id="Syroot.Windows.IO.KnownFolders" version="1.2.1" targetFramework="net472" />
   <package id="System.Buffers" version="4.4.0" targetFramework="net472" />
   <package id="System.Memory" version="4.5.3" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />