Fix pop gesture cancelled issue

This should fix the bug I just filed.