Move location of entity undo timeout check