Pending sub modal #1445

Then use that here too to remove the duplication