popup: split own functionality into target modifiers (close #968)

ok