Updated backspace/enter behaviour