diff --git a/web/react/components/suggestion/command_provider.jsx b/web/react/components/suggestion/command_provider.jsx
index 09c9b9982d..21d6d0e0e1 100644
--- a/web/react/components/suggestion/command_provider.jsx
+++ b/web/react/components/suggestion/command_provider.jsx
@@ -18,7 +18,7 @@ class CommandSuggestion extends React.Component {
                 onClick={onClick}
             >
                 <div className='command__title'>
-                    <string>{item.suggestion}</string>
+                    <string>{item.suggestion} {item.hint}</string>
                 </div>
                 <div className='command__desc'>
                     {item.description}
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 13b57092d8..ca9d81865c 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -787,11 +787,13 @@ export function getSuggestedCommands(command, suggestionId, component) {
             data.forEach((cmd) => {
                 if (('/' + cmd.trigger).indexOf(command) === 0) {
                     let s = '/' + cmd.trigger;
+                    let hint = '';
                     if (cmd.auto_complete_hint && cmd.auto_complete_hint.length !== 0) {
-                        s += ' ' + cmd.auto_complete_hint;
+                        hint = cmd.auto_complete_hint;
                     }
                     matches.push({
                         suggestion: s,
+                        hint,
                         description: cmd.auto_complete_desc
                     });
                 }