Fixes #42 and #44: When creating/editing a bookmark, modal shouldn't close until save is successful