OZP-692: Keyboard Navigation Setup

fix context issues