Finish button was being enabled by default in some wizard screens and navigation is preserved if no input is changed/selected
improve scaffold entities wizard