diff --git a/Telegram/SourceFiles/boxes/edit_color_box.cpp b/Telegram/SourceFiles/boxes/edit_color_box.cpp
index e4b6ae08b..0e55de98a 100644
--- a/Telegram/SourceFiles/boxes/edit_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_color_box.cpp
@@ -704,11 +704,14 @@ void EditColorBox::fieldSubmitted() {
 }
 
 void EditColorBox::saveColor() {
-	_cancelCallback = Fn<void()>();
+	const auto weak = make_weak(this);
+	_cancelCallback = nullptr;
 	if (_saveCallback) {
 		_saveCallback(_new.toRgb());
 	}
-	closeBox();
+	if (weak) {
+		closeBox();
+	}
 }
 
 void EditColorBox::updateHSVFields() {