fromlast

1 files changed, 4 insertions, 6 deletions

diff --git a/src/client/views/nodes/formattedText/RichTextMenu.tsx b/src/client/views/nodes/formattedText/RichTextMenu.tsx
index 23a3d80a4..0a2a54aae 100644
--- a/src/client/views/nodes/formattedText/RichTextMenu.tsx
+++ b/src/client/views/nodes/formattedText/RichTextMenu.tsx
@@ -334,13 +334,11 @@ export class RichTextMenu extends AntimodeMenu<AntimodeMenuProps>   {
     }
 
     setColor(color: String, view: EditorView, dispatch: any) {
-        const colorMark = view.state.schema.mark(view.state.schema.marks.pFontColor, { color });
-        if (view.state.selection.empty) {
-            dispatch(view.state.tr.addStoredMark(colorMark));
-            return false;
+        if (this.view) {
+            const colorMark = view.state.schema.mark(view.state.schema.marks.pFontColor, { color });
+            view.focus();
+            this.setMark(colorMark, this.view.state, (tx: any) => this.view!.dispatch(tx.addStoredMark(colorMark)), true);
         }
-        this.setMark(colorMark, view.state, dispatch, true);
-        view.focus();
     }
 
     // TODO: remove doesn't work