Fix for the double-textbox issues and related dialog freezes