diff --git a/GUIs.GlobalIndexer/ControlCreator.vb b/GUIs.GlobalIndexer/ControlCreator.vb
index 54c57eb4..61a4d2ab 100644
--- a/GUIs.GlobalIndexer/ControlCreator.vb
+++ b/GUIs.GlobalIndexer/ControlCreator.vb
@@ -76,7 +76,11 @@ Public Class ControlCreator
         If pDefaultValue.ToUpper = PLACEHOLDER_NULL Then
             oPicker.EditValue = Nothing
         ElseIf pDefaultValue IsNot Nothing Then
-            oPicker.EditValue = pDefaultValue
+            Dim oDateValue As Date = Nothing
+
+            If Date.TryParse(pDefaultValue, oDateValue) Then
+                oPicker.EditValue = oDateValue
+            End If
         End If
 
         oPicker.Properties.AppearanceFocused.BackColor = HightlightColor