TOOLS-60 (Improvement - Complete): Delay is way too long for save click modal to pop up.