fixed issue with escape key event propagation