#84 Remove annoying behaviour due to onKeyPressed