Keybaord event propagation fix