1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/ExtensionMethods/ViewModelExtensionMethods.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/ExtensionMethods/ViewModelExtensionMethods.cs
index f6b8e2587..73ecd990b 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/ExtensionMethods/ViewModelExtensionMethods.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/ExtensionMethods/ViewModelExtensionMethods.cs
@@ -11,6 +11,7 @@ using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
+using Tango.AutoComplete.Editors;
 using Tango.SharedUI;
 
 public static class ViewModelExtensionMethods
@@ -87,6 +88,11 @@ public static class ViewModelExtensionMethods
                     bindingExpression = child.GetBindingExpression(Tango.SharedUI.Helpers.PasswordHelper.PasswordProperty);
                 }
 
+                if (bindingExpression == null)
+                {
+                    bindingExpression = child.GetBindingExpression(AutoCompleteTextBox.SelectedItemProperty);
+                }
+
                 if (bindingExpression != null)
                 {
                     if (bindingExpression.ResolvedSourcePropertyName == propName)