Implement Tab/Enter for #25