diff --git a/Controls.LookupGrid/frmLookupGrid.vb b/Controls.LookupGrid/frmLookupGrid.vb
index 92bf54cd..dde65cbf 100644
--- a/Controls.LookupGrid/frmLookupGrid.vb
+++ b/Controls.LookupGrid/frmLookupGrid.vb
@@ -157,9 +157,19 @@ Public Class frmLookupGrid
     End Sub
 
     Private Sub gridLookup_KeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.KeyUp
+        HandleCustomKeys(e)
+    End Sub
+
+    Private Sub gridLookup_EditorKeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.EditorKeyUp
+        HandleCustomKeys(e)
+    End Sub
+
+    Private Sub HandleCustomKeys(e As KeyEventArgs)
         If e.KeyCode = Keys.Escape Then
             Close()
         ElseIf e.KeyCode = Keys.F2 Then
+            ' Make sure the currently focused row's state is saved
+            viewLookup.PostEditor()
             SaveSelectedValues()
 
             DialogResult = DialogResult.OK