Fix minor window size issues
Fix minor window size issues

* origin/pr/12076:
  Fix minor window size issues