555: Merge pull request #330 from Wizecoder/bookmarks-crash

Fix crash on bookmarks view