Merge pull request #2343 from nnnick/fix/2152

Only update the size of boxes that are not full width