Fix issue with window automatic width