From 7e799b5625b407cc0347e8331ef10c2c40de1834 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 29 May 2021 20:08:34 +1000
Subject: [PATCH 1/6] keep search activation, enable and disable path and index
 search

---
 .../Languages/en.xaml                         |  2 +
 .../Search/SearchManager.cs                   | 15 ++++--
 .../Flow.Launcher.Plugin.Explorer/Settings.cs |  6 +++
 .../ViewModels/SettingsViewModel.cs           |  6 ++-
 .../Views/ActionKeywordSetting.xaml           |  6 ++-
 .../Views/ActionKeywordSetting.xaml.cs        | 54 +++++++++++++++----
 .../Views/ExplorerSettings.xaml.cs            | 16 +++++-
 .../Flow.Launcher.Plugin.Explorer/plugin.json |  6 ++-
 8 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 3a1a1fb0597..71b16f159d6 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -22,6 +22,8 @@
     <system:String x:Key="plugin_explorer_actionkeywordview_search">Index Search Activation:</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_path">Path Explore Activation:</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_filecontentsearch">File Content Search:</system:String>
+    <system:String x:Key="plugin_explorer_actionkeywordview_indexonlysearch">Index Only Search:</system:String>
+    <system:String x:Key="plugin_explorer_actionkeywordview_brackets_disabled">(Disabled)</system:String>
 
     <!--Plugin Infos-->
     <system:String x:Key="plugin_explorer_plugin_name">Explorer</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 1cb82b75ff5..4ff6070d43f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -46,12 +46,12 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
 
             var result = new HashSet<Result>(PathEqualityComparator.Instance);
 
-            if (ActionKeywordMatch(query, settings.PathSearchActionKeyword))
+            if (ActionKeywordMatch(query, settings.PathSearchActionKeyword) || ActionKeywordMatch(query, settings.SearchActionKeyword))
             {
                 result.UnionWith(await PathSearchAsync(query, token).ConfigureAwait(false));
             }
 
-            if (ActionKeywordMatch(query, settings.SearchActionKeyword) &&
+            if ((ActionKeywordMatch(query, settings.IndexOnlySearchActionKeyword) || ActionKeywordMatch(query, settings.SearchActionKeyword)) &&
                  querySearch.Length > 0 &&
                  !querySearch.IsLocationPathString())
             {
@@ -61,10 +61,15 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
             return result.ToList();
         }
 
-        private bool ActionKeywordMatch(Query query, string actionKeyword)
+        private bool ActionKeywordMatch(Query query, string allowedActionKeyword)
         {
-            return query.ActionKeyword == actionKeyword ||
-                   query.ActionKeyword.Length == 0 && actionKeyword == Query.GlobalPluginWildcardSign;
+            if (settings.EnabledIndexOnlySearchKeyword && (settings.IndexOnlySearchActionKeyword == Query.GlobalPluginWildcardSign || query.ActionKeyword == allowedActionKeyword))
+                return true;
+
+            if (settings.EnabledPathSearchKeyword && (settings.PathSearchActionKeyword == Query.GlobalPluginWildcardSign || query.ActionKeyword == allowedActionKeyword))
+                return true;
+
+            return settings.SearchActionKeyword == Query.GlobalPluginWildcardSign || query.ActionKeyword == allowedActionKeyword;
         }
 
         public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken token = default)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index e078bca6781..0359b00f788 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -22,5 +22,11 @@ public class Settings
         public string FileContentSearchActionKeyword { get; set; } = Constants.DefaultContentSearchActionKeyword;
 
         public string PathSearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
+
+        public bool EnabledPathSearchKeyword { get; set; }
+
+        public string IndexOnlySearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
+
+        public bool EnabledIndexOnlySearchKeyword { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index 9d4019b9a57..ae84f92d495 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -59,6 +59,9 @@ internal void UpdateActionKeyword(ActionKeywordProperty modifiedActionKeyword, s
                 case ActionKeywordProperty.FileContentSearchActionKeyword:
                     Settings.FileContentSearchActionKeyword = newActionKeyword;
                     break;
+                case ActionKeywordProperty.IndexOnlySearchActionKeyword:
+                    Settings.IndexOnlySearchActionKeyword = newActionKeyword;
+                    break;
             }
         }
 
@@ -71,6 +74,7 @@ public enum ActionKeywordProperty
     {
         SearchActionKeyword,
         PathSearchActionKeyword,
-        FileContentSearchActionKeyword
+        FileContentSearchActionKeyword,
+        IndexOnlySearchActionKeyword
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 0e1c7e87265..b49ae3465d2 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -16,6 +16,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="180" />
             <ColumnDefinition />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <TextBlock Margin="20 10 10 10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
                    HorizontalAlignment="Left" Text="Current Action Keyword:" />
@@ -23,8 +24,9 @@
                  Margin="10" Grid.Row="0" Width="105" Grid.Column="1"
                  VerticalAlignment="Center"
                  HorizontalAlignment="Left" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="1">
+        <CheckBox Name="chkActionKeywordEnabled" Margin="10" Grid.Row="0" Grid.Column="2" Content="Enabled" Width="auto" 
+                  VerticalAlignment="Center" Checked="OnActionKeywordEnabledChecked" Unchecked="OnActionKeywordEnabledUnChecked"/>
+        <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="2" Margin="100 92 0 0" Grid.RowSpan="2">
             <Button Click="OnConfirmButtonClick"
                     Margin="10 0 10 0" Width="80" Height="35"
                     Content="OK" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index d1040f746fd..08f162a695b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -1,16 +1,7 @@
 using Flow.Launcher.Plugin.Explorer.ViewModels;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace Flow.Launcher.Plugin.Explorer.Views
 {
@@ -23,20 +14,36 @@ public partial class ActionKeywordSetting : Window
 
         private ActionKeywordView currentActionKeyword;
 
-
         private List<ActionKeywordView> actionKeywordListView;
 
-        public ActionKeywordSetting(SettingsViewModel settingsViewModel, List<ActionKeywordView> actionKeywordListView, ActionKeywordView selectedActionKeyword)
+        private Settings settings;
+
+        public ActionKeywordSetting(SettingsViewModel settingsViewModel, 
+            List<ActionKeywordView> actionKeywordListView, 
+            ActionKeywordView selectedActionKeyword, Settings settings)
         {
             InitializeComponent();
 
             this.settingsViewModel = settingsViewModel;
 
+            this.settings = settings;
+
             currentActionKeyword = selectedActionKeyword;
 
             txtCurrentActionKeyword.Text = selectedActionKeyword.Keyword;
 
             this.actionKeywordListView = actionKeywordListView;
+
+            // Search and File Content action keyword are not allowed to be disabled, they are the default search keyword.
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.SearchActionKeyword
+                || currentActionKeyword.KeywordProperty == ActionKeywordProperty.FileContentSearchActionKeyword)
+                chkActionKeywordEnabled.Visibility = Visibility.Collapsed;
+
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
+                chkActionKeywordEnabled.IsChecked = this.settings.EnabledIndexOnlySearchKeyword;
+
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
+                chkActionKeywordEnabled.IsChecked = this.settings.EnabledPathSearchKeyword;
         }
 
         private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
@@ -81,5 +88,30 @@ private void OnCancelButtonClick(object sender, RoutedEventArgs e)
 
             return;
         }
+        private void OnActionKeywordEnabledChecked(object sender, RoutedEventArgs e)
+        {
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
+                settings.EnabledIndexOnlySearchKeyword = true;
+
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
+                settings.EnabledPathSearchKeyword = true;
+        }
+
+        private void OnActionKeywordEnabledUnChecked(object sender, RoutedEventArgs e)
+        {
+            if (currentActionKeyword.Keyword == settings.IndexOnlySearchActionKeyword)
+            {
+                settings.EnabledIndexOnlySearchKeyword = false;
+                // reset to global so it does not take up an action keyword when disabled
+                settings.IndexOnlySearchActionKeyword = Query.GlobalPluginWildcardSign;
+            }
+
+            if (currentActionKeyword.Keyword == settings.PathSearchActionKeyword)
+            {
+                settings.EnabledPathSearchKeyword = false;
+                // reset to global so it does not take up an action keyword when disabled
+                settings.PathSearchActionKeyword = Query.GlobalPluginWildcardSign;
+            }
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index b8c9a605a28..10ea6b3f443 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -49,9 +49,21 @@ public ExplorerSettings(SettingsViewModel viewModel)
                 },
                 new ()
                 {
-                    Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path"),
+                    Description = viewModel.Settings.EnabledPathSearchKeyword
+                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
+                                    : viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
+                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
                     Keyword = this.viewModel.Settings.PathSearchActionKeyword,
                     KeywordProperty = ActionKeywordProperty.PathSearchActionKeyword
+                },
+                new ()
+                {
+                     Description = viewModel.Settings.EnabledIndexOnlySearchKeyword
+                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
+                                    :  viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
+                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
+                     Keyword = this.viewModel.Settings.IndexOnlySearchActionKeyword,
+                     KeywordProperty = ActionKeywordProperty.IndexOnlySearchActionKeyword
                 }
             };
 
@@ -199,7 +211,7 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)
             {
                 var selectedActionKeyword = lbxActionKeywords.SelectedItem as ActionKeywordView;
 
-                var actionKeywordWindow = new ActionKeywordSetting(viewModel, actionKeywordsListView, selectedActionKeyword);
+                var actionKeywordWindow = new ActionKeywordSetting(viewModel, actionKeywordsListView, selectedActionKeyword, viewModel.Settings);
 
                 actionKeywordWindow.ShowDialog();
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
index 6be1ed95d45..0b46f9fd7af 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
@@ -1,8 +1,10 @@
 {
   "ID": "572be03c74c642baae319fc283e561a8",
   "ActionKeywords": [
-    "*", 
-    "doc:"
+    "*",
+    "doc:",
+    "*",
+    "*"
   ],
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",

From e5fbfa24b4fb63b827cc58598a2b422737d190d7 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 29 May 2021 22:00:10 +1000
Subject: [PATCH 2/6] replace action keyword when updating

---
 Flow.Launcher.Core/Plugin/PluginManager.cs                   | 2 +-
 .../ViewModels/SettingsViewModel.cs                          | 5 +----
 .../Views/ActionKeywordSetting.xaml.cs                       | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
index e2c009ee3aa..7fe771253b0 100644
--- a/Flow.Launcher.Core/Plugin/PluginManager.cs
+++ b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -274,7 +274,7 @@ public static void AddActionKeyword(string id, string newActionKeyword)
         }
 
         /// <summary>
-        /// used to add action keyword for multiple action keyword plugin
+        /// used to remove action keyword for multiple action keyword plugin
         /// e.g. web search
         /// </summary>
         public static void RemoveActionKeyword(string id, string oldActionkeyword)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index ae84f92d495..bc2e6ba0906 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -43,10 +43,7 @@ internal void OpenWindowsIndexingOptions()
 
         internal void UpdateActionKeyword(ActionKeywordProperty modifiedActionKeyword, string newActionKeyword, string oldActionKeyword)
         {
-            if (Settings.SearchActionKeyword == Settings.PathSearchActionKeyword)
-                PluginManager.AddActionKeyword(Context.CurrentPluginMetadata.ID, newActionKeyword);
-            else
-                PluginManager.ReplaceActionKeyword(Context.CurrentPluginMetadata.ID, oldActionKeyword, newActionKeyword);
+            PluginManager.ReplaceActionKeyword(Context.CurrentPluginMetadata.ID, oldActionKeyword, newActionKeyword);
 
             switch (modifiedActionKeyword)
             {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 08f162a695b..99277780270 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -34,7 +34,7 @@ public ActionKeywordSetting(SettingsViewModel settingsViewModel,
 
             this.actionKeywordListView = actionKeywordListView;
 
-            // Search and File Content action keyword are not allowed to be disabled, they are the default search keyword.
+            // Search and File Content action keyword are not allowed to be disabled, they are the default search keywords.
             if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.SearchActionKeyword
                 || currentActionKeyword.KeywordProperty == ActionKeywordProperty.FileContentSearchActionKeyword)
                 chkActionKeywordEnabled.Visibility = Visibility.Collapsed;

From 3bf3afc795bd9d47a8d0fb89de1d2764e0c3dd31 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 30 May 2021 15:11:59 +1000
Subject: [PATCH 3/6] update action keyword match logic

---
 .../Search/SearchManager.cs                   | 13 ++++---
 .../Flow.Launcher.Plugin.Explorer/Settings.cs |  4 ---
 .../Views/ActionKeywordSetting.xaml           |  6 ++--
 .../Views/ActionKeywordSetting.xaml.cs        | 36 -------------------
 .../Views/ExplorerSettings.xaml.cs            | 10 ++----
 5 files changed, 12 insertions(+), 57 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 4ff6070d43f..7a79fbb3a18 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -63,13 +63,16 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
 
         private bool ActionKeywordMatch(Query query, string allowedActionKeyword)
         {
-            if (settings.EnabledIndexOnlySearchKeyword && (settings.IndexOnlySearchActionKeyword == Query.GlobalPluginWildcardSign || query.ActionKeyword == allowedActionKeyword))
-                return true;
+            if (query.ActionKeyword == settings.IndexOnlySearchActionKeyword)
+                return settings.IndexOnlySearchActionKeyword == allowedActionKeyword;
 
-            if (settings.EnabledPathSearchKeyword && (settings.PathSearchActionKeyword == Query.GlobalPluginWildcardSign || query.ActionKeyword == allowedActionKeyword))
-                return true;
+            if (query.ActionKeyword == settings.PathSearchActionKeyword)
+                return settings.PathSearchActionKeyword == allowedActionKeyword;
 
-            return settings.SearchActionKeyword == Query.GlobalPluginWildcardSign || query.ActionKeyword == allowedActionKeyword;
+            if (query.ActionKeyword == settings.SearchActionKeyword)
+                return settings.SearchActionKeyword == allowedActionKeyword;
+
+            return Query.GlobalPluginWildcardSign == allowedActionKeyword;
         }
 
         public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken token = default)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index 0359b00f788..99bc1bd8c75 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -23,10 +23,6 @@ public class Settings
 
         public string PathSearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
 
-        public bool EnabledPathSearchKeyword { get; set; }
-
         public string IndexOnlySearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
-
-        public bool EnabledIndexOnlySearchKeyword { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index b49ae3465d2..0e1c7e87265 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -16,7 +16,6 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="180" />
             <ColumnDefinition />
-            <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <TextBlock Margin="20 10 10 10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
                    HorizontalAlignment="Left" Text="Current Action Keyword:" />
@@ -24,9 +23,8 @@
                  Margin="10" Grid.Row="0" Width="105" Grid.Column="1"
                  VerticalAlignment="Center"
                  HorizontalAlignment="Left" />
-        <CheckBox Name="chkActionKeywordEnabled" Margin="10" Grid.Row="0" Grid.Column="2" Content="Enabled" Width="auto" 
-                  VerticalAlignment="Center" Checked="OnActionKeywordEnabledChecked" Unchecked="OnActionKeywordEnabledUnChecked"/>
-        <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="2" Margin="100 92 0 0" Grid.RowSpan="2">
+
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="1">
             <Button Click="OnConfirmButtonClick"
                     Margin="10 0 10 0" Width="80" Height="35"
                     Content="OK" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 99277780270..e77000beb78 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -33,17 +33,6 @@ public ActionKeywordSetting(SettingsViewModel settingsViewModel,
             txtCurrentActionKeyword.Text = selectedActionKeyword.Keyword;
 
             this.actionKeywordListView = actionKeywordListView;
-
-            // Search and File Content action keyword are not allowed to be disabled, they are the default search keywords.
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.SearchActionKeyword
-                || currentActionKeyword.KeywordProperty == ActionKeywordProperty.FileContentSearchActionKeyword)
-                chkActionKeywordEnabled.Visibility = Visibility.Collapsed;
-
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
-                chkActionKeywordEnabled.IsChecked = this.settings.EnabledIndexOnlySearchKeyword;
-
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
-                chkActionKeywordEnabled.IsChecked = this.settings.EnabledPathSearchKeyword;
         }
 
         private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
@@ -88,30 +77,5 @@ private void OnCancelButtonClick(object sender, RoutedEventArgs e)
 
             return;
         }
-        private void OnActionKeywordEnabledChecked(object sender, RoutedEventArgs e)
-        {
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
-                settings.EnabledIndexOnlySearchKeyword = true;
-
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
-                settings.EnabledPathSearchKeyword = true;
-        }
-
-        private void OnActionKeywordEnabledUnChecked(object sender, RoutedEventArgs e)
-        {
-            if (currentActionKeyword.Keyword == settings.IndexOnlySearchActionKeyword)
-            {
-                settings.EnabledIndexOnlySearchKeyword = false;
-                // reset to global so it does not take up an action keyword when disabled
-                settings.IndexOnlySearchActionKeyword = Query.GlobalPluginWildcardSign;
-            }
-
-            if (currentActionKeyword.Keyword == settings.PathSearchActionKeyword)
-            {
-                settings.EnabledPathSearchKeyword = false;
-                // reset to global so it does not take up an action keyword when disabled
-                settings.PathSearchActionKeyword = Query.GlobalPluginWildcardSign;
-            }
-        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 10ea6b3f443..191f35d7618 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -49,19 +49,13 @@ public ExplorerSettings(SettingsViewModel viewModel)
                 },
                 new ()
                 {
-                    Description = viewModel.Settings.EnabledPathSearchKeyword
-                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
-                                    : viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
-                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
+                    Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path"),
                     Keyword = this.viewModel.Settings.PathSearchActionKeyword,
                     KeywordProperty = ActionKeywordProperty.PathSearchActionKeyword
                 },
                 new ()
                 {
-                     Description = viewModel.Settings.EnabledIndexOnlySearchKeyword
-                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
-                                    :  viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
-                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
+                     Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch"),
                      Keyword = this.viewModel.Settings.IndexOnlySearchActionKeyword,
                      KeywordProperty = ActionKeywordProperty.IndexOnlySearchActionKeyword
                 }

From e9abaf3f6c32846e0da77bd770b1b2e7f5b3d3c1 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 30 May 2021 15:19:32 +1000
Subject: [PATCH 4/6] remove obsolete key

---
 Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 71b16f159d6..a118e7ad0ea 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -23,7 +23,6 @@
     <system:String x:Key="plugin_explorer_actionkeywordview_path">Path Explore Activation:</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_filecontentsearch">File Content Search:</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_indexonlysearch">Index Only Search:</system:String>
-    <system:String x:Key="plugin_explorer_actionkeywordview_brackets_disabled">(Disabled)</system:String>
 
     <!--Plugin Infos-->
     <system:String x:Key="plugin_explorer_plugin_name">Explorer</system:String>

From 995cf568ff58595094ebc450a1fff402266aeefd Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 30 May 2021 19:28:18 +1000
Subject: [PATCH 5/6] option to allow action keywords to be disabled

---
 .../Languages/en.xaml                         |  1 +
 .../Search/SearchManager.cs                   | 17 ++++---
 .../Flow.Launcher.Plugin.Explorer/Settings.cs | 12 +++++
 .../Views/ActionKeywordSetting.xaml           |  6 ++-
 .../Views/ActionKeywordSetting.xaml.cs        | 47 +++++++++++++++++++
 .../Views/ExplorerSettings.xaml.cs            | 33 +++++++++----
 6 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index a118e7ad0ea..71b16f159d6 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -23,6 +23,7 @@
     <system:String x:Key="plugin_explorer_actionkeywordview_path">Path Explore Activation:</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_filecontentsearch">File Content Search:</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_indexonlysearch">Index Only Search:</system:String>
+    <system:String x:Key="plugin_explorer_actionkeywordview_brackets_disabled">(Disabled)</system:String>
 
     <!--Plugin Infos-->
     <system:String x:Key="plugin_explorer_plugin_name">Explorer</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 7a79fbb3a18..e62fc822c40 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -46,12 +46,12 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
 
             var result = new HashSet<Result>(PathEqualityComparator.Instance);
 
-            if (ActionKeywordMatch(query, settings.PathSearchActionKeyword) || ActionKeywordMatch(query, settings.SearchActionKeyword))
+            if (ActionKeywordMatch(query, Settings.ActionKeyword.PathSearchActionKeyword) || ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword))
             {
                 result.UnionWith(await PathSearchAsync(query, token).ConfigureAwait(false));
             }
 
-            if ((ActionKeywordMatch(query, settings.IndexOnlySearchActionKeyword) || ActionKeywordMatch(query, settings.SearchActionKeyword)) &&
+            if ((ActionKeywordMatch(query, Settings.ActionKeyword.IndexOnlySearchActionKeyword) || ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword)) &&
                  querySearch.Length > 0 &&
                  !querySearch.IsLocationPathString())
             {
@@ -61,18 +61,21 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
             return result.ToList();
         }
 
-        private bool ActionKeywordMatch(Query query, string allowedActionKeyword)
+        private bool ActionKeywordMatch(Query query, Settings.ActionKeyword allowedActionKeyword)
         {
             if (query.ActionKeyword == settings.IndexOnlySearchActionKeyword)
-                return settings.IndexOnlySearchActionKeyword == allowedActionKeyword;
+                return Settings.ActionKeyword.IndexOnlySearchActionKeyword == allowedActionKeyword && settings.EnabledIndexOnlySearchKeyword;
 
             if (query.ActionKeyword == settings.PathSearchActionKeyword)
-                return settings.PathSearchActionKeyword == allowedActionKeyword;
+                return Settings.ActionKeyword.PathSearchActionKeyword == allowedActionKeyword && settings.EnabledPathSearchKeyword;
 
             if (query.ActionKeyword == settings.SearchActionKeyword)
-                return settings.SearchActionKeyword == allowedActionKeyword;
+                return Settings.ActionKeyword.SearchActionKeyword == allowedActionKeyword;
 
-            return Query.GlobalPluginWildcardSign == allowedActionKeyword;
+            
+            return (Settings.ActionKeyword.IndexOnlySearchActionKeyword == allowedActionKeyword && settings.EnabledIndexOnlySearchKeyword)
+                || (Settings.ActionKeyword.PathSearchActionKeyword == allowedActionKeyword && settings.EnabledPathSearchKeyword)
+                || settings.SearchActionKeyword == Query.GlobalPluginWildcardSign;
         }
 
         public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken token = default)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index 99bc1bd8c75..aaf4d297781 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -23,6 +23,18 @@ public class Settings
 
         public string PathSearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
 
+        public bool EnabledPathSearchKeyword { get; set; }
+
         public string IndexOnlySearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
+
+        public bool EnabledIndexOnlySearchKeyword { get; set; }
+
+        internal enum ActionKeyword
+        {
+            SearchActionKeyword,
+            PathSearchActionKeyword,
+            FileContentSearchActionKeyword,
+            IndexOnlySearchActionKeyword
+        }
     }
 }
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 0e1c7e87265..b49ae3465d2 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -16,6 +16,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="180" />
             <ColumnDefinition />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <TextBlock Margin="20 10 10 10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
                    HorizontalAlignment="Left" Text="Current Action Keyword:" />
@@ -23,8 +24,9 @@
                  Margin="10" Grid.Row="0" Width="105" Grid.Column="1"
                  VerticalAlignment="Center"
                  HorizontalAlignment="Left" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="1">
+        <CheckBox Name="chkActionKeywordEnabled" Margin="10" Grid.Row="0" Grid.Column="2" Content="Enabled" Width="auto" 
+                  VerticalAlignment="Center" Checked="OnActionKeywordEnabledChecked" Unchecked="OnActionKeywordEnabledUnChecked"/>
+        <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="2" Margin="100 92 0 0" Grid.RowSpan="2">
             <Button Click="OnConfirmButtonClick"
                     Margin="10 0 10 0" Width="80" Height="35"
                     Content="OK" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index e77000beb78..f80ee4c84fa 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -33,6 +33,17 @@ public ActionKeywordSetting(SettingsViewModel settingsViewModel,
             txtCurrentActionKeyword.Text = selectedActionKeyword.Keyword;
 
             this.actionKeywordListView = actionKeywordListView;
+
+            // Search and File Content action keyword are not allowed to be disabled, they are the default search keywords.
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.SearchActionKeyword
+                || currentActionKeyword.KeywordProperty == ActionKeywordProperty.FileContentSearchActionKeyword)
+                chkActionKeywordEnabled.Visibility = Visibility.Collapsed;
+
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
+                chkActionKeywordEnabled.IsChecked = this.settings.EnabledIndexOnlySearchKeyword;
+
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
+                chkActionKeywordEnabled.IsChecked = this.settings.EnabledPathSearchKeyword;
         }
 
         private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
@@ -42,6 +53,24 @@ private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
             if (string.IsNullOrEmpty(newActionKeyword))
                 return;
 
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
+            {
+                // reset to global so it does not take up an action keyword when disabled
+                if (!currentActionKeyword.Enabled && newActionKeyword != Query.GlobalPluginWildcardSign)
+                    settingsViewModel.UpdateActionKeyword(currentActionKeyword.KeywordProperty, Query.GlobalPluginWildcardSign, currentActionKeyword.Keyword);
+
+                settings.EnabledIndexOnlySearchKeyword = currentActionKeyword.Enabled;
+            }
+
+            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
+            {
+                // reset to global so it does not take up an action keyword when disabled
+                if (!currentActionKeyword.Enabled && newActionKeyword != Query.GlobalPluginWildcardSign)
+                    settingsViewModel.UpdateActionKeyword(currentActionKeyword.KeywordProperty, Query.GlobalPluginWildcardSign, currentActionKeyword.Keyword);
+
+                settings.EnabledPathSearchKeyword = currentActionKeyword.Enabled;
+            }
+
             if (newActionKeyword == currentActionKeyword.Keyword)
             {
                 Close();
@@ -63,6 +92,15 @@ private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
 
                 actionKeywordListView.FirstOrDefault(x => x.Description == currentActionKeyword.Description).Keyword = newActionKeyword;
 
+                // automatically help users set this to enabled if an action keyword is set and currently disabled
+                if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword 
+                    && !settings.EnabledIndexOnlySearchKeyword)
+                    settings.EnabledIndexOnlySearchKeyword = true;
+
+                if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword
+                    && !settings.EnabledPathSearchKeyword)
+                    settings.EnabledPathSearchKeyword = true;
+
                 Close();
 
                 return;
@@ -77,5 +115,14 @@ private void OnCancelButtonClick(object sender, RoutedEventArgs e)
 
             return;
         }
+        private void OnActionKeywordEnabledChecked(object sender, RoutedEventArgs e)
+        {
+            currentActionKeyword.Enabled = true;
+        }
+
+        private void OnActionKeywordEnabledUnChecked(object sender, RoutedEventArgs e)
+        {
+            currentActionKeyword.Enabled = false;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 191f35d7618..d0c51d0d74b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -38,26 +38,36 @@ public ExplorerSettings(SettingsViewModel viewModel)
                 new ()
                 {
                      Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_search"),
-                     Keyword = this.viewModel.Settings.SearchActionKeyword, 
-                     KeywordProperty = ActionKeywordProperty.SearchActionKeyword
+                     Keyword = viewModel.Settings.SearchActionKeyword,
+                     KeywordProperty = ActionKeywordProperty.SearchActionKeyword,
+                     Enabled = true
                 },
                 new ()
                 {
                      Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_filecontentsearch"),
-                     Keyword = this.viewModel.Settings.FileContentSearchActionKeyword,
-                     KeywordProperty = ActionKeywordProperty.FileContentSearchActionKeyword
+                     Keyword = viewModel.Settings.FileContentSearchActionKeyword,
+                     KeywordProperty = ActionKeywordProperty.FileContentSearchActionKeyword,
+                     Enabled = true
                 },
                 new ()
                 {
-                    Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path"),
-                    Keyword = this.viewModel.Settings.PathSearchActionKeyword,
-                    KeywordProperty = ActionKeywordProperty.PathSearchActionKeyword
+                    Description = viewModel.Settings.EnabledPathSearchKeyword
+                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
+                                    : viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
+                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
+                    Keyword = viewModel.Settings.PathSearchActionKeyword,
+                    KeywordProperty = ActionKeywordProperty.PathSearchActionKeyword,
+                    Enabled = viewModel.Settings.EnabledPathSearchKeyword
                 },
                 new ()
                 {
-                     Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch"),
-                     Keyword = this.viewModel.Settings.IndexOnlySearchActionKeyword,
-                     KeywordProperty = ActionKeywordProperty.IndexOnlySearchActionKeyword
+                     Description = viewModel.Settings.EnabledIndexOnlySearchKeyword
+                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
+                                    :  viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
+                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
+                     Keyword = viewModel.Settings.IndexOnlySearchActionKeyword,
+                     KeywordProperty = ActionKeywordProperty.IndexOnlySearchActionKeyword,
+                     Enabled = viewModel.Settings.EnabledIndexOnlySearchKeyword
                 }
             };
 
@@ -330,6 +340,9 @@ public class ActionKeywordView
         public string Description { get; set; }
 
         public ActionKeywordProperty KeywordProperty { get; init; }
+
         public string Keyword { get; set; }
+
+        public bool Enabled { get; set; }
     }
 }

From 5966ddc4d9f7d80b1a1f1f5142d6ea3c80672a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Tue, 1 Jun 2021 18:10:24 -0700
Subject: [PATCH 6/6] Refactor Code 1. Moving Property match to Settings.cs 2.
 Use Binding to avoid explicit Function Assign 3. Simplify ActionKeywordMatch

---
 .../Search/SearchManager.cs                   |  83 +++++++-------
 .../Flow.Launcher.Plugin.Explorer/Settings.cs |  37 ++++++
 .../ViewModels/SettingsViewModel.cs           |  18 +--
 .../Views/ActionKeywordSetting.xaml           |  14 ++-
 .../Views/ActionKeywordSetting.xaml.cs        |  77 ++++---------
 .../Views/ExplorerSettings.xaml               |   6 +-
 .../Views/ExplorerSettings.xaml.cs            | 107 +++++++++---------
 7 files changed, 178 insertions(+), 164 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index e62fc822c40..8082da1dc0d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -26,6 +26,7 @@ private class PathEqualityComparator : IEqualityComparer<Result>
         {
             private static PathEqualityComparator instance;
             public static PathEqualityComparator Instance => instance ??= new PathEqualityComparator();
+
             public bool Equals(Result x, Result y)
             {
                 return x.SubTitle == y.SubTitle;
@@ -46,16 +47,19 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
 
             var result = new HashSet<Result>(PathEqualityComparator.Instance);
 
-            if (ActionKeywordMatch(query, Settings.ActionKeyword.PathSearchActionKeyword) || ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword))
+            if (ActionKeywordMatch(query, Settings.ActionKeyword.PathSearchActionKeyword) ||
+                ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword))
             {
                 result.UnionWith(await PathSearchAsync(query, token).ConfigureAwait(false));
             }
 
-            if ((ActionKeywordMatch(query, Settings.ActionKeyword.IndexOnlySearchActionKeyword) || ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword)) &&
-                 querySearch.Length > 0 &&
-                 !querySearch.IsLocationPathString())
+            if ((ActionKeywordMatch(query, Settings.ActionKeyword.IndexOnlySearchActionKeyword) ||
+                 ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword)) &&
+                querySearch.Length > 0 &&
+                !querySearch.IsLocationPathString())
             {
-                result.UnionWith(await WindowsIndexFilesAndFoldersSearchAsync(query, querySearch, token).ConfigureAwait(false));
+                result.UnionWith(await WindowsIndexFilesAndFoldersSearchAsync(query, querySearch, token)
+                    .ConfigureAwait(false));
             }
 
             return result.ToList();
@@ -63,19 +67,19 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
 
         private bool ActionKeywordMatch(Query query, Settings.ActionKeyword allowedActionKeyword)
         {
-            if (query.ActionKeyword == settings.IndexOnlySearchActionKeyword)
-                return Settings.ActionKeyword.IndexOnlySearchActionKeyword == allowedActionKeyword && settings.EnabledIndexOnlySearchKeyword;
-
-            if (query.ActionKeyword == settings.PathSearchActionKeyword)
-                return Settings.ActionKeyword.PathSearchActionKeyword == allowedActionKeyword && settings.EnabledPathSearchKeyword;
+            var keyword = query.ActionKeyword.Length == 0 ? "*" : query.ActionKeyword;
 
-            if (query.ActionKeyword == settings.SearchActionKeyword)
-                return Settings.ActionKeyword.SearchActionKeyword == allowedActionKeyword;
-
-            
-            return (Settings.ActionKeyword.IndexOnlySearchActionKeyword == allowedActionKeyword && settings.EnabledIndexOnlySearchKeyword)
-                || (Settings.ActionKeyword.PathSearchActionKeyword == allowedActionKeyword && settings.EnabledPathSearchKeyword)
-                || settings.SearchActionKeyword == Query.GlobalPluginWildcardSign;
+            return allowedActionKeyword switch
+            {
+                Settings.ActionKeyword.SearchActionKeyword => settings.EnableSearchActionKeyword &&
+                                                              keyword == settings.SearchActionKeyword,
+                Settings.ActionKeyword.PathSearchActionKeyword => settings.EnabledPathSearchKeyword &&
+                                                                  keyword == settings.PathSearchActionKeyword,
+                Settings.ActionKeyword.FileContentSearchActionKeyword => keyword ==
+                                                                         settings.FileContentSearchActionKeyword,
+                Settings.ActionKeyword.IndexOnlySearchActionKeyword => settings.EnabledIndexOnlySearchKeyword &&
+                                                                       keyword == settings.IndexOnlySearchActionKeyword
+            };
         }
 
         public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken token = default)
@@ -129,7 +133,8 @@ public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken t
             return results.ToList();
         }
 
-        private async Task<List<Result>> WindowsIndexFileContentSearchAsync(Query query, string querySearchString, CancellationToken token)
+        private async Task<List<Result>> WindowsIndexFileContentSearchAsync(Query query, string querySearchString,
+            CancellationToken token)
         {
             var queryConstructor = new QueryConstructor(settings);
 
@@ -137,11 +142,11 @@ private async Task<List<Result>> WindowsIndexFileContentSearchAsync(Query query,
                 return new List<Result>();
 
             return await IndexSearch.WindowsIndexSearchAsync(querySearchString,
-                                                    queryConstructor.CreateQueryHelper().ConnectionString,
-                                                    queryConstructor.QueryForFileContentSearch,
-                                                    settings.IndexSearchExcludedSubdirectoryPaths,
-                                                    query,
-                                                    token).ConfigureAwait(false);
+                queryConstructor.CreateQueryHelper().ConnectionString,
+                queryConstructor.QueryForFileContentSearch,
+                settings.IndexSearchExcludedSubdirectoryPaths,
+                query,
+                token).ConfigureAwait(false);
         }
 
         public bool IsFileContentSearch(string actionKeyword)
@@ -168,28 +173,30 @@ public async Task<List<Result>> TopLevelDirectorySearchBehaviourAsync(
             return await windowsIndexSearch(query, querySearchString, token);
         }
 
-        private async Task<List<Result>> WindowsIndexFilesAndFoldersSearchAsync(Query query, string querySearchString, CancellationToken token)
+        private async Task<List<Result>> WindowsIndexFilesAndFoldersSearchAsync(Query query, string querySearchString,
+            CancellationToken token)
         {
             var queryConstructor = new QueryConstructor(settings);
 
             return await IndexSearch.WindowsIndexSearchAsync(querySearchString,
-                                                   queryConstructor.CreateQueryHelper().ConnectionString,
-                                                   queryConstructor.QueryForAllFilesAndFolders,
-                                                   settings.IndexSearchExcludedSubdirectoryPaths,
-                                                   query,
-                                                   token).ConfigureAwait(false);
+                queryConstructor.CreateQueryHelper().ConnectionString,
+                queryConstructor.QueryForAllFilesAndFolders,
+                settings.IndexSearchExcludedSubdirectoryPaths,
+                query,
+                token).ConfigureAwait(false);
         }
 
-        private async Task<List<Result>> WindowsIndexTopLevelFolderSearchAsync(Query query, string path, CancellationToken token)
+        private async Task<List<Result>> WindowsIndexTopLevelFolderSearchAsync(Query query, string path,
+            CancellationToken token)
         {
             var queryConstructor = new QueryConstructor(settings);
 
             return await IndexSearch.WindowsIndexSearchAsync(path,
-                                                   queryConstructor.CreateQueryHelper().ConnectionString,
-                                                   queryConstructor.QueryForTopLevelDirectorySearch,
-                                                   settings.IndexSearchExcludedSubdirectoryPaths,
-                                                   query,
-                                                   token).ConfigureAwait(false);
+                queryConstructor.CreateQueryHelper().ConnectionString,
+                queryConstructor.QueryForTopLevelDirectorySearch,
+                settings.IndexSearchExcludedSubdirectoryPaths,
+                query,
+                token).ConfigureAwait(false);
         }
 
         private bool UseWindowsIndexForDirectorySearch(string locationPath)
@@ -200,11 +207,11 @@ private bool UseWindowsIndexForDirectorySearch(string locationPath)
                 return false;
 
             if (settings.IndexSearchExcludedSubdirectoryPaths
-                            .Any(x => FilesFolders.ReturnPreviousDirectoryIfIncompleteString(pathToDirectory)
-                                        .StartsWith(x.Path, StringComparison.OrdinalIgnoreCase)))
+                .Any(x => FilesFolders.ReturnPreviousDirectoryIfIncompleteString(pathToDirectory)
+                    .StartsWith(x.Path, StringComparison.OrdinalIgnoreCase)))
                 return false;
 
             return IndexSearch.PathIsIndexed(pathToDirectory);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index aaf4d297781..790e57439f0 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -1,6 +1,9 @@
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
+using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
+using System;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Flow.Launcher.Plugin.Explorer
 {
@@ -18,6 +21,7 @@ public class Settings
         public List<AccessLink> IndexSearchExcludedSubdirectoryPaths { get; set; } = new List<AccessLink>();
 
         public string SearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
+        public bool EnableSearchActionKeyword { get; set; } = true;
 
         public string FileContentSearchActionKeyword { get; set; } = Constants.DefaultContentSearchActionKeyword;
 
@@ -36,5 +40,38 @@ internal enum ActionKeyword
             FileContentSearchActionKeyword,
             IndexOnlySearchActionKeyword
         }
+
+        internal string GetActionKeyword(ActionKeyword actionKeyword) => actionKeyword switch
+        {
+            ActionKeyword.SearchActionKeyword => SearchActionKeyword,
+            ActionKeyword.PathSearchActionKeyword => PathSearchActionKeyword,
+            ActionKeyword.FileContentSearchActionKeyword => FileContentSearchActionKeyword,
+            ActionKeyword.IndexOnlySearchActionKeyword => IndexOnlySearchActionKeyword
+        };
+
+        internal void SetActionKeyword(ActionKeyword actionKeyword, string keyword) => _ = actionKeyword switch
+        {
+            ActionKeyword.SearchActionKeyword => SearchActionKeyword = keyword,
+            ActionKeyword.PathSearchActionKeyword => PathSearchActionKeyword = keyword,
+            ActionKeyword.FileContentSearchActionKeyword => FileContentSearchActionKeyword = keyword,
+            ActionKeyword.IndexOnlySearchActionKeyword => IndexOnlySearchActionKeyword = keyword,
+            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "Unexpected property")
+        };
+
+        internal bool? GetActionKeywordEnable(ActionKeyword actionKeyword) => actionKeyword switch
+        {
+            ActionKeyword.SearchActionKeyword => EnableSearchActionKeyword,
+            ActionKeyword.PathSearchActionKeyword => EnabledPathSearchKeyword,
+            ActionKeyword.IndexOnlySearchActionKeyword => EnabledIndexOnlySearchKeyword,
+            _ => null
+        };
+
+        internal void SetActionKeywordEnable(ActionKeyword actionKeyword, bool enable) => _ = actionKeyword switch
+        {
+            ActionKeyword.SearchActionKeyword => EnableSearchActionKeyword = enable,
+            ActionKeyword.PathSearchActionKeyword => EnabledPathSearchKeyword = enable,
+            ActionKeyword.IndexOnlySearchActionKeyword => EnabledIndexOnlySearchKeyword = enable,
+            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "Unexpected property")
+        };
     }
 }
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index bc2e6ba0906..3403fef3f79 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -41,22 +41,22 @@ internal void OpenWindowsIndexingOptions()
             Process.Start(psi);
         }
 
-        internal void UpdateActionKeyword(ActionKeywordProperty modifiedActionKeyword, string newActionKeyword, string oldActionKeyword)
+        internal void UpdateActionKeyword(Settings.ActionKeyword modifiedActionKeyword, string newActionKeyword, string oldActionKeyword)
         {
             PluginManager.ReplaceActionKeyword(Context.CurrentPluginMetadata.ID, oldActionKeyword, newActionKeyword);
 
             switch (modifiedActionKeyword)
             {
-                case ActionKeywordProperty.SearchActionKeyword:
+                case Settings.ActionKeyword.SearchActionKeyword:
                     Settings.SearchActionKeyword = newActionKeyword;
                     break;
-                case ActionKeywordProperty.PathSearchActionKeyword:
+                case Settings.ActionKeyword.PathSearchActionKeyword:
                     Settings.PathSearchActionKeyword = newActionKeyword;
                     break;
-                case ActionKeywordProperty.FileContentSearchActionKeyword:
+                case Settings.ActionKeyword.FileContentSearchActionKeyword:
                     Settings.FileContentSearchActionKeyword = newActionKeyword;
                     break;
-                case ActionKeywordProperty.IndexOnlySearchActionKeyword:
+                case Settings.ActionKeyword.IndexOnlySearchActionKeyword:
                     Settings.IndexOnlySearchActionKeyword = newActionKeyword;
                     break;
             }
@@ -66,12 +66,4 @@ internal void UpdateActionKeyword(ActionKeywordProperty modifiedActionKeyword, s
 
         internal bool IsNewActionKeywordGlobal(string newActionKeyword) => newActionKeyword == Query.GlobalPluginWildcardSign;
     }
-
-    public enum ActionKeywordProperty
-    {
-        SearchActionKeyword,
-        PathSearchActionKeyword,
-        FileContentSearchActionKeyword,
-        IndexOnlySearchActionKeyword
-    }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index b49ae3465d2..52df61a5f4d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -7,6 +7,7 @@
         mc:Ignorable="d"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
         Title="Action Keyword Setting" Height="200" Width="500">
     <Grid>
         <Grid.RowDefinitions>
@@ -20,12 +21,15 @@
         </Grid.ColumnDefinitions>
         <TextBlock Margin="20 10 10 10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
                    HorizontalAlignment="Left" Text="Current Action Keyword:" />
-        <TextBox Name="txtCurrentActionKeyword"
+        <TextBox Name="TxtCurrentActionKeyword"
                  Margin="10" Grid.Row="0" Width="105" Grid.Column="1"
                  VerticalAlignment="Center"
-                 HorizontalAlignment="Left" />
-        <CheckBox Name="chkActionKeywordEnabled" Margin="10" Grid.Row="0" Grid.Column="2" Content="Enabled" Width="auto" 
-                  VerticalAlignment="Center" Checked="OnActionKeywordEnabledChecked" Unchecked="OnActionKeywordEnabledUnChecked"/>
+                 HorizontalAlignment="Left"
+                 Text="{Binding CurrentActionKeyword.Keyword}" />
+        <CheckBox Name="ChkActionKeywordEnabled" Margin="10" Grid.Row="0" Grid.Column="2" Content="Enabled"
+                  Width="auto"
+                  VerticalAlignment="Center" IsChecked="{Binding CurrentActionKeyword.Enabled}"
+                  Visibility="{Binding Visible}"/>
         <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="2" Margin="100 92 0 0" Grid.RowSpan="2">
             <Button Click="OnConfirmButtonClick"
                     Margin="10 0 10 0" Width="80" Height="35"
@@ -35,4 +39,4 @@
                     Content="Cancel" />
         </StackPanel>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index f80ee4c84fa..255dd1b3d9c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -12,66 +12,43 @@ public partial class ActionKeywordSetting : Window
     {
         private SettingsViewModel settingsViewModel;
 
-        private ActionKeywordView currentActionKeyword;
+        public ActionKeywordView CurrentActionKeyword { get; set; }
 
         private List<ActionKeywordView> actionKeywordListView;
 
         private Settings settings;
 
-        public ActionKeywordSetting(SettingsViewModel settingsViewModel, 
-            List<ActionKeywordView> actionKeywordListView, 
+        public Visibility Visible => CurrentActionKeyword.Enabled is not null ? Visibility.Visible : Visibility.Collapsed;
+
+        public ActionKeywordSetting(SettingsViewModel settingsViewModel,
+            List<ActionKeywordView> actionKeywordListView,
             ActionKeywordView selectedActionKeyword, Settings settings)
         {
-            InitializeComponent();
-
             this.settingsViewModel = settingsViewModel;
 
             this.settings = settings;
 
-            currentActionKeyword = selectedActionKeyword;
-
-            txtCurrentActionKeyword.Text = selectedActionKeyword.Keyword;
+            CurrentActionKeyword = selectedActionKeyword;
 
             this.actionKeywordListView = actionKeywordListView;
+            
+            InitializeComponent();
 
-            // Search and File Content action keyword are not allowed to be disabled, they are the default search keywords.
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.SearchActionKeyword
-                || currentActionKeyword.KeywordProperty == ActionKeywordProperty.FileContentSearchActionKeyword)
-                chkActionKeywordEnabled.Visibility = Visibility.Collapsed;
-
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
-                chkActionKeywordEnabled.IsChecked = this.settings.EnabledIndexOnlySearchKeyword;
-
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
-                chkActionKeywordEnabled.IsChecked = this.settings.EnabledPathSearchKeyword;
         }
 
         private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
         {
-            var newActionKeyword = txtCurrentActionKeyword.Text;
+            var newActionKeyword = TxtCurrentActionKeyword.Text;
 
             if (string.IsNullOrEmpty(newActionKeyword))
                 return;
 
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword)
-            {
-                // reset to global so it does not take up an action keyword when disabled
-                if (!currentActionKeyword.Enabled && newActionKeyword != Query.GlobalPluginWildcardSign)
-                    settingsViewModel.UpdateActionKeyword(currentActionKeyword.KeywordProperty, Query.GlobalPluginWildcardSign, currentActionKeyword.Keyword);
-
-                settings.EnabledIndexOnlySearchKeyword = currentActionKeyword.Enabled;
-            }
+            // reset to global so it does not take up an action keyword when disabled
+            if (!CurrentActionKeyword.Enabled is not null && newActionKeyword != Query.GlobalPluginWildcardSign)
+                settingsViewModel.UpdateActionKeyword(CurrentActionKeyword.KeywordProperty,
+                    Query.GlobalPluginWildcardSign, CurrentActionKeyword.Keyword);
 
-            if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword)
-            {
-                // reset to global so it does not take up an action keyword when disabled
-                if (!currentActionKeyword.Enabled && newActionKeyword != Query.GlobalPluginWildcardSign)
-                    settingsViewModel.UpdateActionKeyword(currentActionKeyword.KeywordProperty, Query.GlobalPluginWildcardSign, currentActionKeyword.Keyword);
-
-                settings.EnabledPathSearchKeyword = currentActionKeyword.Enabled;
-            }
-
-            if (newActionKeyword == currentActionKeyword.Keyword)
+            if (newActionKeyword == CurrentActionKeyword.Keyword)
             {
                 Close();
 
@@ -79,25 +56,28 @@ private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
             }
 
             if (settingsViewModel.IsNewActionKeywordGlobal(newActionKeyword)
-                && currentActionKeyword.KeywordProperty == ActionKeywordProperty.FileContentSearchActionKeyword)
+                && CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.FileContentSearchActionKeyword)
             {
-                MessageBox.Show(settingsViewModel.Context.API.GetTranslation("plugin_explorer_globalActionKeywordInvalid"));
+                MessageBox.Show(
+                    settingsViewModel.Context.API.GetTranslation("plugin_explorer_globalActionKeywordInvalid"));
 
                 return;
             }
 
             if (!settingsViewModel.IsActionKeywordAlreadyAssigned(newActionKeyword))
             {
-                settingsViewModel.UpdateActionKeyword(currentActionKeyword.KeywordProperty, newActionKeyword, currentActionKeyword.Keyword);
+                settingsViewModel.UpdateActionKeyword(CurrentActionKeyword.KeywordProperty, newActionKeyword,
+                    CurrentActionKeyword.Keyword);
 
-                actionKeywordListView.FirstOrDefault(x => x.Description == currentActionKeyword.Description).Keyword = newActionKeyword;
+                actionKeywordListView.FirstOrDefault(x => x.Description == CurrentActionKeyword.Description).Keyword =
+                    newActionKeyword;
 
                 // automatically help users set this to enabled if an action keyword is set and currently disabled
-                if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.IndexOnlySearchActionKeyword 
+                if (CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.IndexOnlySearchActionKeyword
                     && !settings.EnabledIndexOnlySearchKeyword)
                     settings.EnabledIndexOnlySearchKeyword = true;
 
-                if (currentActionKeyword.KeywordProperty == ActionKeywordProperty.PathSearchActionKeyword
+                if (CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.PathSearchActionKeyword
                     && !settings.EnabledPathSearchKeyword)
                     settings.EnabledPathSearchKeyword = true;
 
@@ -115,14 +95,5 @@ private void OnCancelButtonClick(object sender, RoutedEventArgs e)
 
             return;
         }
-        private void OnActionKeywordEnabledChecked(object sender, RoutedEventArgs e)
-        {
-            currentActionKeyword.Enabled = true;
-        }
-
-        private void OnActionKeywordEnabledUnChecked(object sender, RoutedEventArgs e)
-        {
-            currentActionKeyword.Enabled = false;
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index ce6dbba36b0..50171a363d9 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
+             xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
@@ -17,13 +18,16 @@
                 Text="{Binding Path, Mode=OneTime}"
                 Margin="0,5,0,5" />
         </DataTemplate>
-        <DataTemplate x:Key="ListViewActionKeywords">
+        <DataTemplate x:Key="ListViewActionKeywords"
+                      DataType="views:ActionKeywordView">
             <Grid>
                 <TextBlock 
                     Text="{Binding Description, Mode=OneTime}"
+                    Foreground="{Binding Color, Mode=OneWay}"
                     Margin="0,5,0,0" />
                 <TextBlock 
                     Text="{Binding Keyword, Mode=OneTime}"
+                    Foreground="{Binding Color, Mode=OneWay}"
                     Margin="250,5,0,0" />
             </Grid>
         </DataTemplate>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index d0c51d0d74b..d5f6386f24f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -35,44 +35,20 @@ public ExplorerSettings(SettingsViewModel viewModel)
 
             actionKeywordsListView = new List<ActionKeywordView>
             {
-                new ()
-                {
-                     Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_search"),
-                     Keyword = viewModel.Settings.SearchActionKeyword,
-                     KeywordProperty = ActionKeywordProperty.SearchActionKeyword,
-                     Enabled = true
-                },
-                new ()
-                {
-                     Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_filecontentsearch"),
-                     Keyword = viewModel.Settings.FileContentSearchActionKeyword,
-                     KeywordProperty = ActionKeywordProperty.FileContentSearchActionKeyword,
-                     Enabled = true
-                },
-                new ()
-                {
-                    Description = viewModel.Settings.EnabledPathSearchKeyword
-                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
-                                    : viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")
-                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
-                    Keyword = viewModel.Settings.PathSearchActionKeyword,
-                    KeywordProperty = ActionKeywordProperty.PathSearchActionKeyword,
-                    Enabled = viewModel.Settings.EnabledPathSearchKeyword
-                },
-                new ()
-                {
-                     Description = viewModel.Settings.EnabledIndexOnlySearchKeyword
-                                    ? viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
-                                    :  viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch")
-                                        + " " + viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_brackets_disabled"),
-                     Keyword = viewModel.Settings.IndexOnlySearchActionKeyword,
-                     KeywordProperty = ActionKeywordProperty.IndexOnlySearchActionKeyword,
-                     Enabled = viewModel.Settings.EnabledIndexOnlySearchKeyword
-                }
+                new(Settings.ActionKeyword.SearchActionKeyword,
+                    viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_search")),
+                new(Settings.ActionKeyword.FileContentSearchActionKeyword,
+                    viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_filecontentsearch")),
+                new(Settings.ActionKeyword.PathSearchActionKeyword,
+                    viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_path")),
+                new(Settings.ActionKeyword.IndexOnlySearchActionKeyword,
+                    viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexonlysearch"))
             };
 
             lbxActionKeywords.ItemsSource = actionKeywordsListView;
 
+            ActionKeywordView.Init(viewModel.Settings, viewModel.Context.API);
+
             RefreshView();
         }
 
@@ -96,8 +72,8 @@ public void RefreshView()
                     btnEdit.Visibility = Visibility.Visible;
 
                 if (lbxAccessLinks.Items.Count == 0 && lbxExcludedPaths.Items.Count == 0
-                    && btnDelete.Visibility == Visibility.Visible
-                    && btnEdit.Visibility == Visibility.Visible)
+                                                    && btnDelete.Visibility == Visibility.Visible
+                                                    && btnEdit.Visibility == Visibility.Visible)
                 {
                     btnDelete.Visibility = Visibility.Hidden;
                     btnEdit.Visibility = Visibility.Hidden;
@@ -189,7 +165,8 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
 
             if (selectedRow != null)
             {
-                string msg = string.Format(viewModel.Context.API.GetTranslation("plugin_explorer_delete_folder_link"), selectedRow.Path);
+                string msg = string.Format(viewModel.Context.API.GetTranslation("plugin_explorer_delete_folder_link"),
+                    selectedRow.Path);
 
                 if (MessageBox.Show(msg, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
@@ -215,7 +192,8 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)
             {
                 var selectedActionKeyword = lbxActionKeywords.SelectedItem as ActionKeywordView;
 
-                var actionKeywordWindow = new ActionKeywordSetting(viewModel, actionKeywordsListView, selectedActionKeyword, viewModel.Settings);
+                var actionKeywordWindow = new ActionKeywordSetting(viewModel, actionKeywordsListView,
+                    selectedActionKeyword, viewModel.Settings);
 
                 actionKeywordWindow.ShowDialog();
 
@@ -223,7 +201,8 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
+                var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ??
+                                  lbxExcludedPaths.SelectedItem as AccessLink;
 
                 if (selectedRow != null)
                 {
@@ -239,7 +218,8 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)
 
                         if (expExcludedPaths.IsExpanded)
                         {
-                            var link = viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.First(x => x.Path == selectedRow.Path);
+                            var link = viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.First(x =>
+                                x.Path == selectedRow.Path);
                             link.Path = folderBrowserDialog.SelectedPath;
                         }
                     }
@@ -259,10 +239,7 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
             var folderBrowserDialog = new FolderBrowserDialog();
             if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
             {
-                var newAccessLink = new AccessLink
-                {
-                    Path = folderBrowserDialog.SelectedPath
-                };
+                var newAccessLink = new AccessLink {Path = folderBrowserDialog.SelectedPath};
 
                 AddAccessLink(newAccessLink);
             }
@@ -283,10 +260,7 @@ private void lbxAccessLinks_Drop(object sender, DragEventArgs e)
                 {
                     if (Directory.Exists(s))
                     {
-                        var newFolderLink = new AccessLink
-                        {
-                            Path = s
-                        };
+                        var newFolderLink = new AccessLink {Path = s};
 
                         AddAccessLink(newFolderLink);
                     }
@@ -299,7 +273,7 @@ private void lbxAccessLinks_Drop(object sender, DragEventArgs e)
         private void AddAccessLink(AccessLink newAccessLink)
         {
             if (expAccessLinks.IsExpanded
-                    && !viewModel.Settings.QuickAccessLinks.Any(x => x.Path == newAccessLink.Path))
+                && !viewModel.Settings.QuickAccessLinks.Any(x => x.Path == newAccessLink.Path))
             {
                 if (viewModel.Settings.QuickAccessLinks == null)
                     viewModel.Settings.QuickAccessLinks = new List<AccessLink>();
@@ -337,12 +311,37 @@ private void btnOpenIndexingOptions_Click(object sender, RoutedEventArgs e)
 
     public class ActionKeywordView
     {
-        public string Description { get; set; }
+        private static Settings _settings;
+        private static IPublicAPI _api;
 
-        public ActionKeywordProperty KeywordProperty { get; init; }
+        public static void Init(Settings settings, IPublicAPI api)
+        {
+            _settings = settings;
+            _api = api;
+        }
 
-        public string Keyword { get; set; }
+        internal ActionKeywordView(Settings.ActionKeyword actionKeyword, string description)
+        {
+            KeywordProperty = actionKeyword;
+            Description = description;
+        }
+
+        public string Description { get; private init; }
+        public string Color => Enabled ?? true ? "Black" : "Gray";
 
-        public bool Enabled { get; set; }
+        internal Settings.ActionKeyword KeywordProperty { get; }
+
+        public string Keyword
+        {
+            get => _settings.GetActionKeyword(KeywordProperty);
+            set => _settings.SetActionKeyword(KeywordProperty, value);
+        }
+
+        public bool? Enabled
+        {
+            get => _settings.GetActionKeywordEnable(KeywordProperty);
+            set => _settings.SetActionKeywordEnable(KeywordProperty,
+                value ?? throw new ArgumentException("Unexpected null value"));
+        }
     }
-}
+}
\ No newline at end of file