Fix #7214 - move edit code into popover