Logistics fix for edit popover