Upload: Fix popup destruction