Make shift-delete/shift-backspace behavior match non-shift behavior

Closes #1839