Improve handling of 'outside tap' dismissals.