diff --git a/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs b/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs
index 3de95fe47..64e75f573 100644
--- a/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs
+++ b/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs
@@ -17,7 +17,9 @@ namespace Flow.Launcher.Converters
             }
             var QueryText = values[1] as TextBox;
             var Suggestion = values[0] as TextBox;
+            Suggestion.CaretIndex = QueryText.CaretIndex;
             Suggestion.ScrollToHorizontalOffset(QueryText.HorizontalOffset);
+            
             // first prop is the current query string
             var queryText = QueryText.Text;