Fixed: dialog focus issue. Improved focus model