diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 887b13126cf..5af76f37f39 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -14,102 +14,102 @@
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
+
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Grid>
-            <StackPanel Grid.Row="0">
-                <StackPanel>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Button
-                            Grid.Column="4"
-                            Click="BtnCancel_OnClick"
-                            Style="{StaticResource TitleBarCloseButtonStyle}">
-                            <Path
-                                Width="46"
-                                Height="32"
-                                Data="M 18,11 27,20 M 18,20 27,11"
-                                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                                StrokeThickness="1">
-                                <Path.Style>
-                                    <Style TargetType="Path">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-                                                <Setter Property="Opacity" Value="0.5" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Path.Style>
-                            </Path>
-                        </Button>
-                    </Grid>
-                </StackPanel>
-                <StackPanel Margin="26 12 26 0">
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="0 0 0 0"
-                            FontSize="20"
-                            FontWeight="SemiBold"
-                            Text="{DynamicResource actionKeywordsTitle}"
-                            TextAlignment="Left" />
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            FontSize="14"
-                            Text="{DynamicResource actionkeyword_tips}"
-                            TextAlignment="Left"
-                            TextWrapping="WrapWithOverflow" />
-                    </StackPanel>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
-                    <StackPanel Margin="0 18 0 0" Orientation="Horizontal">
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource currentActionKeywords}" />
-                        <TextBlock
-                            x:Name="tbOldActionKeyword"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Margin="14 10 10 10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            FontWeight="SemiBold"
-                            Foreground="{DynamicResource Color05B}" />
-                    </StackPanel>
-                    <StackPanel Margin="0 0 0 10" Orientation="Horizontal">
-                        <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource newActionKeyword}" />
-                        <TextBox
-                            x:Name="tbAction"
-                            Width="105"
-                            Margin="10 10 15 10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center" />
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-        <Border
+        <Button
+            Grid.Row="0"
+            Grid.Column="1"
+            HorizontalAlignment="Right"
+            Click="BtnCancel_OnClick"
+            Style="{StaticResource TitleBarCloseButtonStyle}">
+            <Path
+                Width="46"
+                Height="32"
+                Data="M 18,11 27,20 M 18,20 27,11"
+                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                StrokeThickness="1">
+                <Path.Style>
+                    <Style TargetType="Path">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                <Setter Property="Opacity" Value="0.5" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Path.Style>
+            </Path>
+        </Button>
+
+        <TextBlock
             Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="26 12 26 12"
+            FontSize="20"
+            FontWeight="SemiBold"
+            Text="{DynamicResource actionKeywordsTitle}"
+            TextAlignment="Left" />
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="26 0 26 10"
+            FontSize="14"
+            Text="{DynamicResource actionkeyword_tips}"
+            TextAlignment="Left"
+            TextWrapping="WrapWithOverflow" />
+
+        <TextBlock
+            Grid.Row="3"
+            Grid.Column="0"
+            Margin="26 0 10 0"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource currentActionKeywords}" />
+        <TextBox
+            x:Name="tbOldActionKeyword"
+            Grid.Row="3"
+            Grid.Column="1"
+            Margin="10 10 26 6"
+            VerticalAlignment="Center"
+            FontSize="14"
+            FontWeight="SemiBold"
+            Foreground="{DynamicResource Color05B}"
+            IsReadOnly="True"
+            Text="List of old keyword(s)" />
+
+        <TextBlock
+            Grid.Row="4"
+            Grid.Column="0"
+            Margin="26 6 10 12"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource newActionKeyword}" />
+        <TextBox
+            x:Name="tbAction"
+            Grid.Row="4"
+            Grid.Column="1"
+            Margin="10 6 26 10"
+            VerticalAlignment="Center" />
+
+        <Border
+            Grid.Row="5"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="0 10 0 0"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
             BorderThickness="0 1 0 0">
@@ -117,15 +117,15 @@
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Height="30"
-                    Margin="10 0 5 0"
+                    Height="38"
+                    Margin="10 0 10 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="145"
-                    Height="30"
-                    Margin="5 0 10 0"
+                    Height="38"
+                    Margin="10 0 10 0"
                     Click="btnDone_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs
index 9420b4c380e..8e05686c982 100644
--- a/Flow.Launcher/ActionKeywords.xaml.cs
+++ b/Flow.Launcher/ActionKeywords.xaml.cs
@@ -20,7 +20,9 @@ public ActionKeywords(PluginViewModel pluginViewModel)
 
         private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
         {
-            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords.ToArray());
+            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords);
+            tbAction.Text = tbOldActionKeyword.Text;
+            tbAction.SelectAll();
             tbAction.Focus();
         }
 
@@ -33,38 +35,39 @@ private void btnDone_OnClick(object sender, RoutedEventArgs _)
         {
             var oldActionKeywords = _plugin.Metadata.ActionKeywords;
 
-            var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator).ToList();
-            newActionKeywords.RemoveAll(string.IsNullOrEmpty);
-            newActionKeywords = newActionKeywords.Distinct().ToList();
+            var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator)
+                                                 .Where(s => !string.IsNullOrEmpty(s))
+                                                 .Distinct()
+                                                 .ToList();
 
             newActionKeywords = newActionKeywords.Count > 0 ? newActionKeywords : new() { Query.GlobalPluginWildcardSign };
 
             var addedActionKeywords = newActionKeywords.Except(oldActionKeywords).ToList();
             var removedActionKeywords = oldActionKeywords.Except(newActionKeywords).ToList();
-            if (!addedActionKeywords.Any(App.API.ActionKeywordAssigned))
+
+            if (addedActionKeywords.Any(App.API.ActionKeywordAssigned))
+            {
+                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
+                return;
+            }
+
+            if (oldActionKeywords.Count != newActionKeywords.Count)
             {
-                if (oldActionKeywords.Count != newActionKeywords.Count)
-                {
-                    ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
-                    return;
-                }
+                ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
+                return;
+            }
 
-                var sortedOldActionKeywords = oldActionKeywords.OrderBy(s => s).ToList();
-                var sortedNewActionKeywords = newActionKeywords.OrderBy(s => s).ToList();
+            var sortedOldActionKeywords = oldActionKeywords.OrderBy(s => s).ToList();
+            var sortedNewActionKeywords = newActionKeywords.OrderBy(s => s).ToList();
 
-                if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
-                {
-                    // User just changes the sequence of action keywords
-                    App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
-                }
-                else
-                {
-                    ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
-                }
+            if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
+            {
+                // User just changes the sequence of action keywords
+                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
             }
             else
             {
-                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
+                ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
             }
         }