SOAP-752: Treat enter in text fields as OK-button in a better way