diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
index bd1e5c311d..9c0c85cc34 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
@@ -331,9 +331,8 @@ void EditorBlock::activateRow(const Row &row) {
 			const auto state = editor->lifetime().make_state<State>();
 
 			const auto save = crl::guard(this, [=] {
-				saveEditing(editor->color());
 				state->cancelLifetime.destroy();
-				box->closeBox();
+				saveEditing(editor->color());
 			});
 			box->boxClosing(
 			) | rpl::start_with_next(crl::guard(this, [=] {