diff --git a/src/element/textWysiwyg.tsx b/src/element/textWysiwyg.tsx
index c52360830..a062101ad 100644
--- a/src/element/textWysiwyg.tsx
+++ b/src/element/textWysiwyg.tsx
@@ -564,7 +564,10 @@ export const textWysiwyg = ({
         });
         handleSubmit();
       };
-      if (target && isTargetColorPicker) {
+      if (
+        target &&
+        (isTargetColorPicker || isShapeActionsPanel)
+      ) {
         target.onblur = () => {
           editable.focus();
         };