More fixes to the popup-dialog