Issue #80 solved: focus given to the right widget on un/re-doing