PM: improve keyboard accessibility across modules