Slight improvement to keyboard shortcuts