diff --git a/src/app/views/query-runner/query-input/auto-complete/AutoComplete.tsx b/src/app/views/query-runner/query-input/auto-complete/AutoComplete.tsx
index 9449499a0..7f2581940 100644
--- a/src/app/views/query-runner/query-input/auto-complete/AutoComplete.tsx
+++ b/src/app/views/query-runner/query-input/auto-complete/AutoComplete.tsx
@@ -145,6 +145,7 @@ class AutoComplete extends Component<IAutoCompleteProps, IAutoCompleteState> {
           const selected = filteredSuggestions[activeSuggestion];
           this.appendSuggestionToUrl(selected);
         } else {
+          event.preventDefault();
           this.props.contentChanged(queryUrl);
           this.props.runQuery();
         }
@@ -250,7 +251,7 @@ class AutoComplete extends Component<IAutoCompleteProps, IAutoCompleteState> {
   }
 
   private setSuggestions(suggestions: string[], compare?: string) {
-    const sortedSuggestions = suggestions.sort(dynamicSort(null, SortOrder.ASC));
+    const sortedSuggestions = this.sortSuggestions(suggestions);
     this.setState({
       filteredSuggestions: sortedSuggestions,
       suggestions: sortedSuggestions,
@@ -259,6 +260,10 @@ class AutoComplete extends Component<IAutoCompleteProps, IAutoCompleteState> {
     });
   }
 
+  private sortSuggestions(suggestions: string[]): string[]{
+    return suggestions.sort(dynamicSort(null, SortOrder.ASC));
+  }
+
   public componentDidUpdate = (prevProps: IAutoCompleteProps) => {
     if (prevProps.autoCompleteOptions !== this.props.autoCompleteOptions) {
       if (this.props.autoCompleteOptions) {
diff --git a/src/tests/utils/sample-url-generation.spec.tsx b/src/tests/utils/sample-url-generation.spec.tsx
index bb78b81f0..d86df4493 100644
--- a/src/tests/utils/sample-url-generation.spec.tsx
+++ b/src/tests/utils/sample-url-generation.spec.tsx
@@ -87,7 +87,8 @@ describe('hasWhiteSpaces should', () => {
     {url: 'https://graph.microsoft.com/v1.0/ me', output: true},
     {url:
       'https://graph.microsoft.com/v1.0/me/contacts?$filter=emailAddresses/any(a:a/address eq \'garth@contoso.com\')',
-    output: false}
+    output: false},
+    {url: 'https://graph.microsoft.com/v1.0/me     ', output: true}
   ];
   invalidUrls.forEach(invalidUrl => {
     it(`validate whitespaces in the url: ${invalidUrl.url}`, () => {