diff --git a/Wox.Plugin.System/DirectoryIndicator.cs b/Wox.Plugin.System/DirectoryIndicator.cs
index 6d6a6878d5..dfc8dcc6b0 100644
--- a/Wox.Plugin.System/DirectoryIndicator.cs
+++ b/Wox.Plugin.System/DirectoryIndicator.cs
@@ -10,33 +10,135 @@ namespace Wox.Plugin.System
 {
     public class DirectoryIndicator : BaseSystemPlugin
     {
+        private static  List<string> driverNames = null;
+        private static Dictionary<string, DirectoryInfo[]> parentDirectories = new Dictionary<string, DirectoryInfo[]>();
+
         protected override List<Result> QueryInternal(Query query)
         {
             List<Result> results = new List<Result>();
-            if (string.IsNullOrEmpty(query.RawQuery)) return results;
+            if (string.IsNullOrEmpty(query.RawQuery))
+            {
+                // clear the cache
+                if (parentDirectories.Count > 0)
+                    parentDirectories.Clear();
+
+                return results;
+            }
+
+            var input = query.RawQuery.ToLower();
+            if (driverNames.FirstOrDefault(x => input.StartsWith(x)) == null) return results;
 
             if (Directory.Exists(query.RawQuery))
             {
-                Result result = new Result
+                // show all child directory
+                if (input.EndsWith("\\") || input.EndsWith("/"))
                 {
-                    Title = "Open this directory",
-                    SubTitle = string.Format("path: {0}", query.RawQuery),
-                    Score = 50,
-                    IcoPath = "Images/folder.png",
-                    Action = (c) =>
+                    var dirInfo = new DirectoryInfo(query.RawQuery);
+                    var dirs = dirInfo.GetDirectories();
+
+                    var parentDirKey = input.TrimEnd('\\', '/');
+                    if (!parentDirectories.ContainsKey(parentDirKey))
+                        parentDirectories.Add(parentDirKey, dirs);
+
+                    foreach (var dir in dirs)
                     {
-                        Process.Start(query.RawQuery);
-                        return true;
+                        if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
+                            continue;
+
+                        var dirPath = dir.FullName;
+                        Result result = new Result
+                        {
+                            Title = dir.Name,
+                            SubTitle = "Open this directory",
+                            IcoPath = "Images/folder.png",
+                            Action = (c) =>
+                            {
+                                Process.Start(dirPath);
+                                return true;
+                            }
+                        };
+                        results.Add(result);
                     }
-                };
-                results.Add(result); 
+
+                    if (results.Count == 0)
+                    {
+                        Result result = new Result
+                        {
+                            Title = "No files in this directory",
+                            SubTitle = "",
+                            IcoPath = "Images/folder.png",
+                        };
+                        results.Add(result);
+                    }
+                }
+                else
+                {
+                    Result result = new Result
+                    {
+                        Title = "Open this directory",
+                        SubTitle = string.Format("path: {0}", query.RawQuery),
+                        Score = 50,
+                        IcoPath = "Images/folder.png",
+                        Action = (c) =>
+                        {
+                            Process.Start(query.RawQuery);
+                            return true;
+                        }
+                    };
+                    results.Add(result);
+                }
+
             }
 
+            // change to search in current directory
+            var parentDir = Path.GetDirectoryName(input);
+            if (!string.IsNullOrEmpty(parentDir) && results.Count == 0)
+            {
+                parentDir = parentDir.TrimEnd('\\', '/');
+                if (parentDirectories.ContainsKey(parentDir))
+                {
+                    var dirs = parentDirectories[parentDir];
+                    var queryFileName = Path.GetFileName(query.RawQuery).ToLower();
+                    foreach (var dir in dirs)
+                    {
+                        if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
+                            continue;
+
+                        if (!dir.Name.ToLower().StartsWith(queryFileName))
+                            continue;
+
+                        var dirPath = dir.FullName;
+                        Result result = new Result
+                        {
+                            Title = dir.Name,
+                            SubTitle = "Open this directory",
+                            IcoPath = "Images/folder.png",
+                            Action = (c) =>
+                            {
+                                Process.Start(dirPath);
+                                return true;
+                            }
+                        };
+                        results.Add(result);
+                    }
+                }
+            }
+            
+
             return results;
         }
 
         protected override void InitInternal(PluginInitContext context)
         {
+            if (driverNames == null)
+            {
+                driverNames = new List<string>();
+                var allDrives = DriveInfo.GetDrives();
+                foreach (var driver in allDrives)
+                {
+                    driverNames.Add(driver.Name.ToLower().TrimEnd('\\'));
+                }
+            }
         }
 
     }