Use NSApp.keyWindow Over Global keyWindow
#1819
Merged
NSApp.keyWindow Over Global keyWindow
#1819