diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 366407182e0..0573a948b05 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -538,7 +538,9 @@ private void OnKeyDown(object sender, KeyEventArgs e)
 
         private void MoveQueryTextToEnd()
         {
-            Dispatcher.Invoke(() => QueryTextBox.CaretIndex = QueryTextBox.Text.Length);
+            // QueryTextBox seems to be update with a DispatcherPriority as low as ContextIdle.
+            // To ensure QueryTextBox is up to date with QueryText from the View, we need to Dispatch with such a priority
+            Dispatcher.Invoke(() => QueryTextBox.CaretIndex = QueryTextBox.Text.Length, System.Windows.Threading.DispatcherPriority.ContextIdle);
         }
 
         public void InitializeColorScheme()
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 0fe3bdf8052..0531c925d78 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -346,6 +346,9 @@ public void ChangeQueryText(string queryText, bool reQuery = false)
             {
                 // re-query is done in QueryText's setter method
                 QueryText = queryText;
+                // set to false so the subsequent set true triggers
+                // PropertyChanged and MoveQueryTextToEnd is called
+                QueryTextCursorMovedToEnd = false;
             }
             else if (reQuery)
             {