diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb
index 0a1201f..3597bfc 100644
--- a/app/DD_PM_WINDREAM/frmMassValidator.vb
+++ b/app/DD_PM_WINDREAM/frmMassValidator.vb
@@ -313,7 +313,7 @@ Public Class frmMassValidator
                             Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{ctrl.Name}%'"
                             DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges)
                             If filteredData.Rows.Count = 1 Then
-                                AddHandler lookup.EditValueChanged, AddressOf onLookUp1
+                                AddHandler lookup.SelectedValuesChanged, AddressOf onLookUp1
                             End If
                         End If
 
@@ -355,15 +355,15 @@ Public Class frmMassValidator
         End Try
 
     End Sub
-    Public Sub onLookUp1(sender As Object, e As System.EventArgs)
+    Public Sub onLookUp1(sender As Object, SelectedValues As List(Of String))
         If FORM_Shown = False Then
             Exit Sub
         End If
         Dim oLookup As LookupControl2 = sender
         Try
-            If Not IsNothing(oLookup.SelectedValues) Then
-                If oLookup.SelectedValues.Count = 1 Then
-                    Dim oLOOKUPValue = oLookup.SelectedValues.Item(0)
+            If Not IsNothing(SelectedValues) Then
+                If SelectedValues.Count = 1 Then
+                    Dim oLOOKUPValue = SelectedValues.Item(0)
                     Dim oLOOKUPName = oLookup.Name
 
                     Dim oControlID = oLookup.Tag
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index b2f3467..7bd3cb6 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -780,7 +780,8 @@ Public Class frmValidator
                             Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{ctrl.Name}%'"
                             DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges)
                             If filteredData.Rows.Count = 1 Then
-                                AddHandler lookup.EditValueChanged, AddressOf onLookUp1
+                                'AddHandler lookup.EditValueChanged, AddressOf onLookUp1
+                                AddHandler lookup.SelectedValuesChanged, AddressOf onLookUp1
                             End If
                         End If
 
@@ -1002,15 +1003,15 @@ Public Class frmValidator
 
         End Try
     End Sub
-    Public Sub onLookUp1(sender As Object, e As System.EventArgs)
+    Public Sub onLookUp1(sender As Object, SelectedValues As List(Of String))
         If FormLoaded = False Then
             Exit Sub
         End If
         Dim oLookup As LookupControl2 = sender
         Try
-            If Not IsNothing(oLookup.SelectedValues) Then
-                If oLookup.SelectedValues.Count = 1 Then
-                    Dim oLOOKUPValue = oLookup.SelectedValues.Item(0)
+            If Not IsNothing(SelectedValues) Then
+                If SelectedValues.Count = 1 Then
+                    Dim oLOOKUPValue = SelectedValues.Item(0)
                     Dim oLOOKUPName = oLookup.Name
 
                     Dim oControlID = oLookup.Tag