diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index 8ee90c69..31e33325 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -163,6 +163,7 @@ Public Class RepositoryItemLookupControl3
                     NullText = String.Format(_R.GetString("LookupControl_NoRecords"))
                 Case 1
                     NullText = Values.FirstOrDefault()
+                    OwnerEdit.EditValue = Values.FirstOrDefault()
                 Case Else
                     NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count)
             End Select
@@ -172,6 +173,7 @@ Public Class RepositoryItemLookupControl3
                     NullText = String.Format(_R.GetString("LookupControl_NoRecords"))
                 Case Else
                     NullText = Values.FirstOrDefault()
+                    OwnerEdit.EditValue = Values.FirstOrDefault()
             End Select
         End If