diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
index bd2a047eb..efa5339b4 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
@@ -104,6 +104,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Flow.Launcher.Core\Flow.Launcher.Core.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 431a41438..b7710d332 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -3,6 +3,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <!--Dialogues-->
+    <system:String x:Key="plugin_explorer_make_selection_warning">Please make a selection first</system:String>
     <system:String x:Key="plugin_explorer_select_folder_link_warning">Please select a folder link</system:String>
     <system:String x:Key="plugin_explorer_delete_folder_link">Are you sure you want to delete {0}?</system:String>
     <system:String x:Key="plugin_explorer_deletefilefolderconfirm">Are you sure you want to permanently delete this {0}?</system:String>
@@ -17,6 +18,8 @@
     <system:String x:Key="plugin_explorer_quickfolderaccess_header">Quick Folder Access Paths</system:String>
     <system:String x:Key="plugin_explorer_indexsearchexcludedpaths_header">Index Search Excluded Paths</system:String>
     <system:String x:Key="plugin_explorer_manageindexoptions">Indexing Options</system:String>
+    <system:String x:Key="plugin_explorer_actionkeywordview_search">Search Activation:</system:String>
+    <system:String x:Key="plugin_explorer_actionkeywordview_filecontentsearch">File Content Search:</system:String>
 
     <!--Plugin Infos-->
     <system:String x:Key="plugin_explorer_plugin_name">Explorer</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index a5e81716a..e14a6ebb5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -1,4 +1,5 @@
-using Flow.Launcher.Infrastructure.Storage;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
 using System.Diagnostics;
@@ -40,5 +41,18 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
 
             Process.Start(psi);
         }
+
+        internal void UpdateActionKeyword(string newActionKeyword, string oldActionKeyword)
+        {
+            PluginManager.ReplaceActionKeyword(Context.CurrentPluginMetadata.ID, oldActionKeyword, newActionKeyword);
+
+            if (Settings.FileContentSearchActionKeyword == oldActionKeyword)
+                Settings.FileContentSearchActionKeyword = newActionKeyword;
+
+            if (Settings.SearchActionKeyword == oldActionKeyword)
+                Settings.SearchActionKeyword = newActionKeyword;
+        }
+
+        internal bool IsActionKeywordAlreadyAssigned(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
new file mode 100644
index 000000000..0e1c7e872
--- /dev/null
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -0,0 +1,36 @@
+<Window x:Class="Flow.Launcher.Plugin.Explorer.Views.ActionKeywordSetting"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
+        mc:Ignorable="d"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterScreen"
+        Title="Action Keyword Setting" Height="200" Width="500">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="180" />
+            <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:" />
+        <TextBox Name="txtCurrentActionKeyword"
+                 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">
+            <Button Click="OnConfirmButtonClick"
+                    Margin="10 0 10 0" Width="80" Height="35"
+                    Content="OK" />
+            <Button Click="OnCancelButtonClick"
+                    Margin="10 0 10 0" Width="80" Height="35"
+                    Content="Cancel" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
new file mode 100644
index 000000000..b9e5373b7
--- /dev/null
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -0,0 +1,76 @@
+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
+{
+    /// <summary>
+    /// Interaction logic for ActionKeywordSetting.xaml
+    /// </summary>
+    public partial class ActionKeywordSetting : Window
+    {
+        private SettingsViewModel settingsViewModel;
+
+        private ActionKeywordView currentActionKeyword;
+
+        private List<ActionKeywordView> actionKeywordListView;
+
+        public ActionKeywordSetting(SettingsViewModel settingsViewModel, List<ActionKeywordView> actionKeywordListView, ActionKeywordView selectedActionKeyword)
+        {
+            InitializeComponent();
+
+            this.settingsViewModel = settingsViewModel;
+
+            currentActionKeyword = selectedActionKeyword;
+
+            txtCurrentActionKeyword.Text = selectedActionKeyword.Keyword;
+
+            this.actionKeywordListView = actionKeywordListView; 
+        }
+
+        private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
+        {
+            var newActionKeyword = txtCurrentActionKeyword.Text;
+
+            if (string.IsNullOrEmpty(newActionKeyword))
+                return;
+
+            if (newActionKeyword == currentActionKeyword.Keyword)
+            {
+                Close();
+
+                return;
+            }
+            
+            if(!settingsViewModel.IsActionKeywordAlreadyAssigned(newActionKeyword))
+            {
+                settingsViewModel.UpdateActionKeyword(newActionKeyword, currentActionKeyword.Keyword);
+
+                actionKeywordListView.Where(x => x.Description == currentActionKeyword.Description).FirstOrDefault().Keyword = newActionKeyword;
+
+                Close();
+
+                return;
+            }
+
+            MessageBox.Show(settingsViewModel.Context.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
+        }
+
+        private void OnCancelButtonClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+
+            return;
+        }
+    }
+}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index e4f220ed6..3b67b408d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -20,6 +20,9 @@ namespace Flow.Launcher.Plugin.Explorer.Views
     public partial class ExplorerSettings
     {
         private readonly SettingsViewModel viewModel;
+
+        private List<ActionKeywordView> actionKeywordsListView;
+
         public ExplorerSettings(SettingsViewModel viewModel)
         {
             InitializeComponent();
@@ -30,10 +33,19 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
             lbxExcludedPaths.ItemsSource = this.viewModel.Settings.IndexSearchExcludedSubdirectoryPaths;
 
-            var actionKeywordsListView = new List<ActionKeywordView>();
-
-            actionKeywordsListView.Add(new ActionKeywordView() { Description = "Search Activation:", Keyword = this.viewModel.Settings.SearchActionKeyword });
-            actionKeywordsListView.Add(new ActionKeywordView() { Description = "File Content Search:", Keyword = this.viewModel.Settings.FileContentSearchActionKeyword });
+            actionKeywordsListView = new List<ActionKeywordView>
+            {
+                new ActionKeywordView() 
+                        { 
+                            Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_search"), 
+                            Keyword = this.viewModel.Settings.SearchActionKeyword 
+                        },
+                new ActionKeywordView() 
+                        { 
+                            Description = viewModel.Context.API.GetTranslation("plugin_explorer_actionkeywordview_filecontentsearch"), 
+                            Keyword = this.viewModel.Settings.FileContentSearchActionKeyword 
+                        }
+            };
 
             lbxActionKeywords.ItemsSource = actionKeywordsListView;
 
@@ -175,33 +187,46 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         private void btnEdit_Click(object sender, RoutedEventArgs e)
         {
-            var selectedRow = lbxFolderLinks.SelectedItem as FolderLink ?? lbxExcludedPaths.SelectedItem as FolderLink;
-
-            if (selectedRow != null)
+            if (lbxActionKeywords.SelectedItem is ActionKeywordView)
             {
-                var folderBrowserDialog = new FolderBrowserDialog();
-                folderBrowserDialog.SelectedPath = selectedRow.Path;
-                if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
-                {
-                    if (expFolderLinks.IsExpanded)
-                    {
-                        var link = viewModel.Settings.QuickFolderAccessLinks.First(x => x.Path == selectedRow.Path);
-                        link.Path = folderBrowserDialog.SelectedPath;
-                    }
+                var selectedActionKeyword = lbxActionKeywords.SelectedItem as ActionKeywordView;
 
-                    if (expExcludedPaths.IsExpanded)
-                    {
-                        var link = viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.First(x => x.Path == selectedRow.Path);
-                        link.Path = folderBrowserDialog.SelectedPath;
-                    }
-                }
+                var actionKeywordWindow = new ActionKeywordSetting(viewModel, actionKeywordsListView, selectedActionKeyword);
+
+                actionKeywordWindow.ShowDialog();
 
                 RefreshView();
             }
             else
             {
-                string warning = viewModel.Context.API.GetTranslation("plugin_explorer_select_folder_link_warning");
-                MessageBox.Show(warning);
+                var selectedRow = lbxFolderLinks.SelectedItem as FolderLink ?? lbxExcludedPaths.SelectedItem as FolderLink;
+
+                if (selectedRow != null)
+                {
+                    var folderBrowserDialog = new FolderBrowserDialog();
+                    folderBrowserDialog.SelectedPath = selectedRow.Path;
+                    if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
+                    {
+                        if (expFolderLinks.IsExpanded)
+                        {
+                            var link = viewModel.Settings.QuickFolderAccessLinks.First(x => x.Path == selectedRow.Path);
+                            link.Path = folderBrowserDialog.SelectedPath;
+                        }
+
+                        if (expExcludedPaths.IsExpanded)
+                        {
+                            var link = viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.First(x => x.Path == selectedRow.Path);
+                            link.Path = folderBrowserDialog.SelectedPath;
+                        }
+                    }
+
+                    RefreshView();
+                }
+                else
+                {
+                    string warning = viewModel.Context.API.GetTranslation("plugin_explorer_make_selection_warning");
+                    MessageBox.Show(warning);
+                }
             }
         }