Stop toolbar repeditively loading.
Merge pull request #614 from godarklight/fix-toolbar

Stop toolbar repeditively loading.