#5979: Set overflow only when needed
Merge pull request #6066 from dotCMS/issue-5979-set-overflow

#5979: Set overflow only when needed