Adding proper attachment to window which was broken in #4