Revert "Revert "ScanPopup Update""

This reverts commit c633bd409e46bdacbb1c6d0441d1e18b751e5402.