diff --git a/Plugins/Flow.Launcher.Plugin.Folder/Main.cs b/Plugins/Flow.Launcher.Plugin.Folder/Main.cs
index dafd1a90e..663574c98 100644
--- a/Plugins/Flow.Launcher.Plugin.Folder/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Folder/Main.cs
@@ -58,10 +58,12 @@ namespace Flow.Launcher.Plugin.Folder
             var results = GetUserFolderResults(query);
 
             string search = query.Search.ToLower();
-            if (!IsDriveOrSharedFolder(search))
+            if (!IsDriveOrSharedFolder(search) && !IsEnvironmentVariableSearch(search))
+            {
                 return results;
+            }
 
-            if (search.StartsWith("%"))
+            if (IsEnvironmentVariableSearch(search))
             {
                 results.AddRange(GetEnvironmentStringPathResults(search, query));
             }
@@ -79,6 +81,11 @@ namespace Flow.Launcher.Plugin.Folder
             return results;
         }
 
+        private static bool IsEnvironmentVariableSearch(string search)
+        {
+            return _envStringPaths != null && search.StartsWith("%");
+        }
+
         private static bool IsDriveOrSharedFolder(string search)
         {
             if (search.StartsWith(@"\\"))
@@ -86,11 +93,6 @@ namespace Flow.Launcher.Plugin.Folder
                 return true;
             }
 
-            if (_envStringPaths != null && search.StartsWith("%"))
-            { // environment string formatted folder
-                return true;
-            }
-
             if (_driverNames != null && _driverNames.Any(search.StartsWith))
             { // normal drive letter
                 return true;