Fixes for MC and other window shortcut.