Merge pull request #4343 from TeamAmaze/bookmark-dialog-fix