...and also fixed direct undo shortcut/menu-item-click