Fixed usability bug with O hotkey