diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js
index e60661f6b..d9a044022 100644
--- a/app/soapbox/components/autosuggest_textarea.js
+++ b/app/soapbox/components/autosuggest_textarea.js
@@ -50,7 +50,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
     autoFocus: PropTypes.bool,
     onFocus: PropTypes.func,
     onBlur: PropTypes.func,
-    clickableAreaRef: PropTypes.object,
   };
 
   static defaultProps = {
@@ -108,8 +107,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
       if (suggestions.size > 0 && !suggestionsHidden) {
         e.preventDefault();
         this.setState({ selectedSuggestion: Math.min(selectedSuggestion + 1, suggestions.size - 1) });
-      } else {
-        this.setState({ lastToken: null });
       }
 
       break;
@@ -117,8 +114,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
       if (suggestions.size > 0 && !suggestionsHidden) {
         e.preventDefault();
         this.setState({ selectedSuggestion: Math.max(selectedSuggestion - 1, 0) });
-      } else {
-        this.setState({ lastToken: null });
       }
 
       break;
@@ -164,28 +159,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
     this.textarea.focus();
   }
 
-  getClickableArea = () => {
-    const { clickableAreaRef } = this.props;
-    return clickableAreaRef ? clickableAreaRef.current : this.form;
-  }
-
-  isClickInside = (e) => {
-    return [
-      this.getClickableArea(),
-      document.querySelector('.autosuggest-textarea__textarea'),
-    ].some(element => element && element.contains(e.target));
-  }
-
-  handleClick = (e) => {
-    if (this.isClickInside(e)) {
-      this.setState({ lastToken: null });
-    }
-  }
-
-  componentDidMount() {
-    document.addEventListener('click', this.handleClick, true);
-  }
-
   componentDidUpdate(prevProps, prevState) {
     const { suggestions } = this.props;
     if (suggestions !== prevProps.suggestions && suggestions.size > 0 && prevState.suggestionsHidden && prevState.focused) {