Fixed double pop-up for confirmation-dialog