diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx
index e27b606ee..b576c7444 100644
--- a/app/assets/javascripts/components/actions/compose.jsx
+++ b/app/assets/javascripts/components/actions/compose.jsx
@@ -143,7 +143,7 @@ export function fetchComposeSuggestions(token) {
   return (dispatch, getState) => {
     const loadedCandidates = getState().get('accounts').filter(item => item.get('acct').toLowerCase().slice(0, token.length) === token).map(item => ({
       label: item.get('acct'),
-      completion: item.get('acct').slice(0, token.length)
+      completion: item.get('acct').slice(token.length)
     })).toList().toJS();
 
     dispatch(readyComposeSuggestions(loadedCandidates));
diff --git a/app/assets/javascripts/components/features/ui/components/compose_form.jsx b/app/assets/javascripts/components/features/ui/components/compose_form.jsx
index 464423cf8..0655a7c79 100644
--- a/app/assets/javascripts/components/features/ui/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/ui/components/compose_form.jsx
@@ -31,10 +31,10 @@ const getTokenForSuggestions = (str, caretPosition) => {
   }
 };
 
-const getSuggestionValue = suggestion => suggestion;
+const getSuggestionValue = suggestion => suggestion.completion;
 
 const renderSuggestion = suggestion => (
-  <span>{suggestion}</span>
+  <span>{suggestion.label}</span>
 );
 
 const textareaStyle = {