Improve key binding, add support for disabled windows