Fix window after show errors
Fix unnecessary scrollbars in windows

* origin/pr/12180:
  Fix window after show errors
Fix unnecessary scrollbars in windows

* origin/master:
  Fix window after show errors