Better back click handling