Fixed begin/end key binding