At present, undo tool doesn't work on the first click i.e. it executes on second click onwards which should not be the case.

check the working of both tools and make necessary changes.