Move the point of setting currentFocusControl to before FocusLost.