Fixed nasty bug with fav toolbar