diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 2554de6fe..dd438c10d 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -798,12 +798,16 @@ void FormController::saveValueEdit(
 
 	const auto nonconst = findValue(value);
 	if (!editValueChanged(nonconst, data)) {
-		base::take(nonconst->filesInEdit);
-		base::take(nonconst->selfieInEdit);
-		base::take(nonconst->data.encryptedSecretInEdit);
-		base::take(nonconst->data.hashInEdit);
-		base::take(nonconst->data.parsedInEdit);
-		_valueSaveFinished.fire_copy(nonconst);
+		nonconst->saveRequestId = -1;
+		crl::on_main(this, [=] {
+			base::take(nonconst->filesInEdit);
+			base::take(nonconst->selfieInEdit);
+			base::take(nonconst->data.encryptedSecretInEdit);
+			base::take(nonconst->data.hashInEdit);
+			base::take(nonconst->data.parsedInEdit);
+			nonconst->saveRequestId = 0;
+			_valueSaveFinished.fire_copy(nonconst);
+		});
 		return;
 	}
 	nonconst->data.parsedInEdit = std::move(data);
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
index 7ecaf5b9f..264a15d93 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
@@ -542,13 +542,11 @@ void PanelController::requestScopeFilesType(int index) {
 	Expects(index >= 0 && index < _scopes.size());
 
 	const auto type = _scopes[index].type;
-	const auto box = std::make_shared<QPointer<BoxContent>>();
-	*box = [&] {
+	_scopeFilesTypeBox = [&] {
 		if (type == Scope::Type::Identity) {
 			return show(RequestIdentityType(
 				[=](int filesIndex) {
 					editWithUpload(index, filesIndex);
-					(*box)->closeBox();
 				},
 				ranges::view::all(
 					_scopes[index].files
@@ -570,7 +568,6 @@ void PanelController::requestScopeFilesType(int index) {
 			return show(RequestAddressType(
 				[=](int filesIndex) {
 					editWithUpload(index, filesIndex);
-					(*box)->closeBox();
 				},
 				ranges::view::all(
 					_scopes[index].files
@@ -602,6 +599,7 @@ void PanelController::editWithUpload(int index, int filesIndex) {
 	EditScans::ChooseScan(
 		base::lambda_guarded(_panel.get(),
 		[=](QByteArray &&content) {
+			base::take(_scopeFilesTypeBox);
 			editScope(index, filesIndex);
 			uploadScan(std::move(content));
 		}));
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.h b/Telegram/SourceFiles/passport/passport_panel_controller.h
index b4ae7efc3..49b914800 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.h
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.h
@@ -111,6 +111,7 @@ private:
 	BoxPointer _confirmForgetChangesBox;
 	Scope *_editScope = nullptr;
 	int _editScopeFilesIndex = -1;
+	BoxPointer _scopeFilesTypeBox;
 	std::map<not_null<const Value*>, BoxPointer> _verificationBoxes;
 
 	rpl::lifetime _lifetime;