Bug fix menu navigation with space (#14041)

Change-Id: I1466381b12a147fea90240420d3f6c05cd156a1b