BS-9374 Fix 'finish' button behavior