From c2949114aacf58845f389a4b93a8a9aafeb28687 Mon Sep 17 00:00:00 2001
From: michael-hawker <michael.hawker@outlook.com>
Date: Wed, 30 Oct 2019 19:21:15 -0700
Subject: [PATCH] Fix issue with keyboard selection of suggestions

---
 .../TokenizingTextBox/TokenizingTextBox.cs          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
index 2c59b9860..36f3351e7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
@@ -174,9 +174,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 
         private void AutoSuggestBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
-            if (args.QueryText != string.Empty)
+            if (args.ChosenSuggestion != null)
             {
-                AddToken(args.QueryText);
+                await AddToken(args.ChosenSuggestion);
+                sender.Text = string.Empty;
+                sender.Focus(FocusState.Programmatic);
+            }
+            else if (!string.IsNullOrWhiteSpace(args.QueryText))
+            {
+                await AddToken(args.QueryText);
                 sender.Text = string.Empty;
                 sender.Focus(FocusState.Programmatic);
             }
@@ -186,9 +192,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 
         private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
         {
-            AddToken(args.SelectedItem);
-            sender.Text = string.Empty;
-            sender.Focus(FocusState.Programmatic);
             SuggestionChosen?.Invoke(sender, args);
         }