Fix labels from being blocked by content
Merge pull request #1535 from kkirsche/master

[Fixes #1534] Fix labels from being blocked by content