diff --git a/Telegram/SourceFiles/editor/color_picker.cpp b/Telegram/SourceFiles/editor/color_picker.cpp
index 238f52d2e..0342085fd 100644
--- a/Telegram/SourceFiles/editor/color_picker.cpp
+++ b/Telegram/SourceFiles/editor/color_picker.cpp
@@ -321,4 +321,9 @@ int ColorPicker::colorToPosition(const QColor &color) const {
 	return 0;
 }
 
+bool ColorPicker::preventHandleKeyPress() const {
+	return _canvasForCircle->isVisible()
+		&& (_circleAnimation.animating() || _down.pressed);
+}
+
 } // namespace Editor
diff --git a/Telegram/SourceFiles/editor/color_picker.h b/Telegram/SourceFiles/editor/color_picker.h
index f125c58ed..7069908f9 100644
--- a/Telegram/SourceFiles/editor/color_picker.h
+++ b/Telegram/SourceFiles/editor/color_picker.h
@@ -29,6 +29,7 @@ public:
 
 	void moveLine(const QPoint &position);
 	void setVisible(bool visible);
+	bool preventHandleKeyPress() const;
 
 	rpl::producer<Brush> saveBrushRequests() const;
 
diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp
index 6a4852fcb..8113370be 100644
--- a/Telegram/SourceFiles/editor/photo_editor.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor.cpp
@@ -166,7 +166,9 @@ PhotoEditor::PhotoEditor(
 }
 
 void PhotoEditor::handleKeyPress(not_null<QKeyEvent*> e) {
-	_content->handleKeyPress(e) || _controls->handleKeyPress(e);
+	if (!_colorPicker->preventHandleKeyPress()) {
+		_content->handleKeyPress(e) || _controls->handleKeyPress(e);
+	}
 }
 
 void PhotoEditor::save() {