Fixing a bug where clicks on the toolbar weren't being picked up