diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml
index 6db4be5db7..2784345c4c 100644
--- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml
+++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml
@@ -375,6 +375,7 @@
             x:FieldModifier="public"
             Style="{StaticResource CustomAutoSuggestBoxTextBoxStyle}"
             PlaceholderText="Start typing"
+            Text="{Binding QueryText}"
             Height="60"
             ScrollViewer.BringIntoViewOnFocusChange="False"
             Canvas.ZIndex="0"
diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
index 6bf9a00747..7c7cc62477 100644
--- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
@@ -354,6 +354,12 @@ namespace PowerLauncher
             {
                 _launcher.AutoCompleteTextBox.PlaceholderText = String.Empty;
             }
+
+            if (_viewModel.QueryTextCursorMovedToEnd)
+            {
+                _launcher.TextBox.SelectionStart = _launcher.TextBox.Text.Length;
+                _viewModel.QueryTextCursorMovedToEnd = false;
+            }
         }
 
         private async Task DelayedCheck(DateTime latestTimeOfTyping, string text)