diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
index efdb5a6fe..d15069981 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
@@ -28,7 +28,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
                     RecurseSubdirectories = true
                 }, query, search, criteria, token);
 
-            return DirectorySearch(null, query, search, criteria, token); // null will be passed as default
+            return DirectorySearch(new EnumerationOptions(), query, search, criteria, token); // null will be passed as default
         }
 
         public string ConstructSearchCriteria(string search)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index d51833a6f..6c9b81c88 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -80,12 +80,17 @@ namespace Flow.Launcher.Plugin.Explorer.Search
             if (token.IsCancellationRequested)
                 return null;
 
-            results.AddRange(await TopLevelDirectorySearchBehaviourAsync(WindowsIndexTopLevelFolderSearchAsync,
+            var directoryResult = await TopLevelDirectorySearchBehaviourAsync(WindowsIndexTopLevelFolderSearchAsync,
                 DirectoryInfoClassSearch,
                 useIndexSearch,
                 query,
                 locationPath,
-                token).ConfigureAwait(false));
+                token).ConfigureAwait(false);
+
+            if (token.IsCancellationRequested)
+                return null;
+
+            results.AddRange(directoryResult);
             
             return results;
         }