1.2.2 - Better input handling in dialogs