1 files changed, 8 insertions, 1 deletions
diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Editors/AutoCompleteTextBox.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Editors/AutoCompleteTextBox.cs
index f350c0b9b..253843a57 100644
--- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Editors/AutoCompleteTextBox.cs
+++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Editors/AutoCompleteTextBox.cs
@@ -162,7 +162,10 @@ namespace Tango.AutoComplete.Editors
         {
             get { return (bool)GetValue(IsDropDownOpenProperty); }
 
-            set { SetValue(IsDropDownOpenProperty, value); }
+            set
+            {
+                SetValue(IsDropDownOpenProperty, value);
+            }
         }
 
         public bool IsLoading
@@ -279,6 +282,8 @@ namespace Tango.AutoComplete.Editors
         
         public override void OnApplyTemplate()
         {
+            _isUpdatingText = true;
+
             base.OnApplyTemplate();
 
             Editor = Template.FindName(PartEditor, this) as TextBox;
@@ -315,6 +320,8 @@ namespace Tango.AutoComplete.Editors
                 SelectionAdapter.SelectionChanged += OnSelectionAdapterSelectionChanged;
                 ItemsSelector.PreviewMouseDown += ItemsSelector_PreviewMouseDown;
             }
+
+            _isUpdatingText = false;
         }
         private void ItemsSelector_PreviewMouseDown(object sender, MouseButtonEventArgs e)
         {