Fixed modal closure behaviour

This fixes behaviour of the keyboard-naming-on-new-save modal.

1. User closes without edit -> takes the user back to the editing keyboard stage (default behaviour)
2. User closes successfully -> keyboard is saved, user should return to fully active counting keyboard