Ooops, forgot to set the current window in the last commit. I'll have to