diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index 464a2cbde..8a95ee79f 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -37,7 +37,7 @@ namespace Flow.Launcher.Infrastructure
 
         public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.svg";
 
-        public const string DefaultTheme = "Win11System";
+        public const string DefaultTheme = "Win11Light";
 
         public const string Light = "Light";
         public const string Dark = "Dark";
diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 76a613c3f..13e943c95 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -25,7 +25,7 @@
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 99916491a..919078b66 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -466,6 +466,7 @@
                             <Grid
                                 Width="Auto"
                                 Height="34"
+                                MinWidth="140"
                                 Margin="0">
                                 <StackPanel Margin="12 0" Orientation="Horizontal">
                                     <TextBlock
diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11Light.xaml
similarity index 100%
rename from Flow.Launcher/Themes/Win11System.xaml
rename to Flow.Launcher/Themes/Win11Light.xaml