Fixed popup handling after facet tapped