Created by: Intigracy
fixes #8622 (closed)
I tried to also fix issue #7023 (closed), but window code is terrible.