Added popup behavior