diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 39bf4965494..d2dcf6e5a25 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -70,13 +70,19 @@ public List<Result> Query(Query query)
                 return _themeSelector.Query(query);
             }
 
-            var commands = Commands();
+            var commands = Commands(query);
             var results = new List<Result>();
+            var isEmptyQuery = string.IsNullOrWhiteSpace(query.Search);
             foreach (var c in commands)
             {
                 var command = _settings.Commands.First(x => x.Key == c.Title);
                 c.Title = command.Name;
                 c.SubTitle = command.Description;
+                if (isEmptyQuery)
+                {
+                    results.Add(c);
+                    continue;
+                }
 
                 // Match from localized title & localized subtitle & keyword
                 var titleMatch = _context.API.FuzzySearch(query.Search, c.Title);
@@ -188,7 +194,7 @@ private static unsafe bool EnableShutdownPrivilege()
             }
         }
 
-        private List<Result> Commands()
+        private List<Result> Commands(Query query)
         {
             var results = new List<Result>();
             var recycleBinFolder = "shell:RecycleBinFolder";
@@ -491,7 +497,15 @@ private List<Result> Commands()
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\ue790"),
                     Action = c =>
                     {
-                        _context.API.ChangeQuery($"{ThemeSelector.Keyword} ");
+                        if (string.IsNullOrEmpty(query.ActionKeyword))
+                        {
+                            _context.API.ChangeQuery($"{ThemeSelector.Keyword}{Plugin.Query.ActionKeywordSeparator}");
+                        }
+                        else
+                        {
+                            _context.API.ChangeQuery($"{query.ActionKeyword}{Plugin.Query.ActionKeywordSeparator}{ThemeSelector.Keyword}{Plugin.Query.ActionKeywordSeparator}");
+
+                        }
                         return false;
                     }
                 }