diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb
index 2a4f8ebd..4fe33233 100644
--- a/Controls.LookupGrid/LookupControl2.vb
+++ b/Controls.LookupGrid/LookupControl2.vb
@@ -135,12 +135,6 @@ Public Class LookupControl2
 
         Values.RemoveAll(Function(v) String.IsNullOrEmpty(v))
 
-        ' Update selected values before changing edit value
-        ' in case EditValueChanged event is used to detect changes
-        _SelectedValues = Values
-
-        RaiseEvent SelectedValuesChanged(Me, Values)
-
         If MultiSelect = True Then
             Properties.DataSource = Values
 
@@ -157,6 +151,10 @@ Public Class LookupControl2
             Text = Values.FirstOrDefault()
             EditValue = Nothing
         End If
+
+        _SelectedValues = Values
+
+        RaiseEvent SelectedValuesChanged(Me, Values)
     End Sub
 
     Private Function GetLookupForm() As frmLookupGrid