BS-9374 Fix wrong finish button behavior with validation