Revert "Merge pull request #430 from xia-sava/feature/fix-status-window"

This reverts commit aebfaaaff2a50065f0c691f915285537df6f6f88, reversing
changes made to e3db05bae177af4aa81f36035bda4dad6f7c416f.