diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
index 9da84d09d..ca3b06b8d 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
@@ -91,7 +91,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
                 {
                     Action = _ => DoOpenSettingsAction(entry),
                     IcoPath = type == "AppSettingsApp" ? windowsSettingIconPath : controlPanelIconPath,
-                    SubTitle = $"{Resources.Area} \"{entry.Area}\" {Resources.SubtitlePreposition} {entry.Type}",
+                    SubTitle = GetSubtitle(entry.Area, type),
                     Title = entry.Name + entry.glyph,
                     ContextData = entry,
                     Score = score
@@ -101,6 +101,13 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
             return resultList;
         }
 
+        private static string GetSubtitle(string section, string entryType)
+        {
+            var settingType = entryType == "AppSettingsApp" ? "System settings" : "Control Panel";
+
+            return $"{settingType} > {section}";
+        }
+
         /// <summary>
         /// Add a tool-tip to the given <see cref="Result"/>, based o the given <see cref="IWindowsSetting"/>.
         /// </summary>
@@ -109,8 +116,10 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
         private static void AddOptionalToolTip(WindowsSetting entry, Result result)
         {
             var toolTipText = new StringBuilder();
+            
+            var settingType = entry.Type == "AppSettingsApp" ? "System settings" : "Control Panel";
 
-            toolTipText.AppendLine($"{Resources.Application}: {entry.Type}");
+            toolTipText.AppendLine($"{Resources.Application}: {settingType}");
             toolTipText.AppendLine($"{Resources.Area}: {entry.Area}");
 
             if (entry.AltNames != null && entry.AltNames.Any())