PROV-867 More hotkeys fixes :-(