Reapply keyboard shortcut fix from #770.