Temporary fix for keyboard modifier

Not playing well with the global key handler