Added check and return for tab/enter/space