diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb
index 6a363d3..bf1acd3 100644
--- a/Global_Indexer/ClassControls.vb
+++ b/Global_Indexer/ClassControls.vb
@@ -376,6 +376,8 @@ Public Class ClassControls
 
         If Vorgabe.ToUpper = "NULL" Then
             oPicker.EditValue = Nothing
+        ElseIf Vorgabe IsNot Nothing Then
+            oPicker.EditValue = Vorgabe
         End If
 
         oPicker.Properties.AppearanceFocused.BackColor = Color.Lime