diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index f5fd729d45b..2a5b7057953 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -244,7 +244,8 @@
                             Style="{DynamicResource QueryBoxStyle}"
                             Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Visibility="Visible"
-                            WindowChrome.IsHitTestVisibleInChrome="True">
+                            WindowChrome.IsHitTestVisibleInChrome="True"
+                            Loaded="SelectAllQueryText">
                             <TextBox.CommandBindings>
                                 <CommandBinding Command="ApplicationCommands.Copy" Executed="OnCopy" />
                             </TextBox.CommandBindings>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 8ca153afc34..51ac56c77c3 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -293,6 +293,11 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                         break;
                 }
             };
+
+            if (_settings.SelectAllQueryOnReopen)
+            {
+                SelectAllQueryText();
+            }
         }
 
         private void InitializePosition()
@@ -852,5 +857,10 @@ private void QueryTextBox_KeyUp(object sender, KeyEventArgs e)
                 be.UpdateSource();
             }
         }
+
+        private void SelectAllQueryText()
+        {
+            QueryTextBox.SelectAll();
+        }
     }
 }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 3d94355e687..39a6ff3a005 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -25,6 +25,7 @@ public SettingsPaneGeneralViewModel(Settings settings, Updater updater, IPortabl
         _updater = updater;
         _portable = portable;
         UpdateEnumDropdownLocalizations();
+        SelectAllQueryOnReopen = settings.SelectAllQueryOnReopen; // Pfa33
     }
 
     public class SearchWindowScreenData : DropdownDataGeneric<SearchWindowScreens> { }
@@ -54,6 +55,11 @@ public bool StartFlowLauncherOnSystemStartup
         }
     }
 
+    public bool SelectAllQueryOnReopen // Pbff7
+    {
+        get => Settings.SelectAllQueryOnReopen;
+        set => Settings.SelectAllQueryOnReopen = value;
+    }
 
     public List<SearchWindowScreenData> SearchWindowScreens { get; } =
         DropdownDataGeneric<SearchWindowScreens>.GetValues<SearchWindowScreenData>("SearchWindowScreen");
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index a81d9e0d108..abbf18c8930 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="Flow.Launcher.SettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index cb3f1e4a113..333b74e373b 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -41,6 +41,13 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         hwndTarget.RenderMode = RenderMode.Default;
 
         InitializePosition();
+
+        // Initialize the new checkbox based on the settings
+        var selectAllQueryOnReopenCheckbox = (System.Windows.Controls.CheckBox)FindName("SelectAllQueryOnReopenCheckbox");
+        if (selectAllQueryOnReopenCheckbox != null)
+        {
+            selectAllQueryOnReopenCheckbox.IsChecked = _settings.SelectAllQueryOnReopen;
+        }
     }
 
     private void OnClosed(object sender, EventArgs e)