diff --git a/app/editor/index.tsx b/app/editor/index.tsx
index bb556ed8e..c55c38bb1 100644
--- a/app/editor/index.tsx
+++ b/app/editor/index.tsx
@@ -711,7 +711,7 @@ export class Editor extends React.PureComponent<
       this.view.dispatch(transaction);
       this.view.focus();
     }
-    if (this.state.suggestionsMenuOpen !== type) {
+    if (type && this.state.suggestionsMenuOpen !== type) {
       return;
     }
     this.setState((state) => ({
diff --git a/shared/editor/extensions/Suggestion.tsx b/shared/editor/extensions/Suggestion.tsx
index 3a26664dd..dac0df174 100644
--- a/shared/editor/extensions/Suggestion.tsx
+++ b/shared/editor/extensions/Suggestion.tsx
@@ -29,7 +29,10 @@ export default class Suggestion extends Extension {
     }),
     new InputRule(this.options.closeRegex, (state, match) => {
       if (match) {
-        this.editor.events.emit(EventType.SuggestionsMenuClose);
+        this.editor.events.emit(
+          EventType.SuggestionsMenuClose,
+          this.options.type
+        );
       }
       return null;
     }),