Fixes an issue with the new flexible annotation toolbar.