diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 28747cc7c..05687701d 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -28,8 +28,12 @@ namespace Flow.Launcher.Plugin.Sys
 
         public Control CreateSettingPanel()
         {
-            var results = Commands();
-            return new SysSettings(results);
+            var commands = Commands();
+            foreach (var c in commands)
+            {
+                c.Title = GetDynamicTitle(null, c);
+            }
+            return new SysSettings(commands);
         }
 
         public List<Result> Query(Query query)
@@ -73,6 +77,11 @@ namespace Flow.Launcher.Plugin.Sys
 
             var translatedTitle = context.API.GetTranslation(translationKey);
 
+            if (query == null)
+            {
+                return translatedTitle;
+            }
+
             if (result.Title == translatedTitle)
             {
                 return result.Title;