I think you should make Ctrl+1,2 etc. for query tab. I hardly concur if anybody even closes a window. Probably you can even put it in preference if you want backward compatibility but that would be too much work.
Sorry, a complete Linux and Mac setup here. Dont have any windows boxes for development!