diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 6561419a1..21892303a 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -85,10 +85,13 @@ namespace Flow.Launcher.Core.Resource
 
                 Settings.Theme = theme;
 
+                // reload all resources even if the theme itself hasn't changed in order to pickup changes
+                // to things like fonts
+                UpdateResourceDictionary(GetResourceDictionary());
+
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
-                    UpdateResourceDictionary(GetResourceDictionary());
                     _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
                 }
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index abc8d7205..5ae17e200 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -915,6 +915,7 @@
                             Padding="0,0,0,0"
                             Background="{DynamicResource Color01B}">
                             <ListBox
+                                Name="Plugins"
                                 Width="Auto"
                                 Margin="5,0,0,0"
                                 Padding="0,0,7,0"
@@ -926,8 +927,7 @@
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
                                 SelectionChanged="SelectedPluginChanged"
-                                SnapsToDevicePixels="True"
-                                Name="Plugins">
+                                SnapsToDevicePixels="True">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel Margin="0,0,0,18" />
@@ -1116,8 +1116,8 @@
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
-                                                            Content="{Binding SettingControl}" 
-                                                            SizeChanged="ItemSizeChanged"/>
+                                                            Content="{Binding SettingControl}"
+                                                            SizeChanged="ItemSizeChanged" />
                                                     </StackPanel>
 
                                                     <StackPanel>
@@ -1127,8 +1127,7 @@
                                                             VerticalAlignment="Center"
                                                             BorderThickness="0,1,0,0"
                                                             CornerRadius="0"
-                                                            Style="{DynamicResource SettingGroupBox}"
-                                                            Visibility="{Binding ActionKeywordsVisibility}">
+                                                            Style="{DynamicResource SettingGroupBox}">
                                                             <ItemsControl Style="{DynamicResource SettingGrid}">
                                                                 <StackPanel
                                                                     Margin="0,0,-14,0"