REDO: Fix: Some dialogs are too high #437