Fixes s-2 and s-3 keyboard shortcuts.