Fix popping on non-active branches