Fix pop transition handler logic