diff --git a/src/features/compose/editor/plugins/autosuggest-plugin.tsx b/src/features/compose/editor/plugins/autosuggest-plugin.tsx
index 4ab7ff7ec..66158bb66 100644
--- a/src/features/compose/editor/plugins/autosuggest-plugin.tsx
+++ b/src/features/compose/editor/plugins/autosuggest-plugin.tsx
@@ -504,15 +504,10 @@ const AutosuggestPlugin = ({
         KEY_TAB_COMMAND,
         (payload) => {
           const event = payload;
-          if (suggestions !== null && suggestions.size && selectedSuggestion !== null) {
-            // eslint-disable-next-line no-nested-ternary
-            const newSelectedSuggestion = event.shiftKey
-              ? (selectedSuggestion !== 0 ? selectedSuggestion - 1 : suggestions.size - 1)
-              : (selectedSuggestion !== suggestions.size - 1 ? selectedSuggestion + 1 : 0);
-            setSelectedSuggestion(newSelectedSuggestion);
-            event.preventDefault();
-            event.stopImmediatePropagation();
-          }
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          onSelectSuggestion(selectedSuggestion);
+          setResolution(null);
           return true;
         },
         COMMAND_PRIORITY_LOW,