2 files changed, 9 insertions, 5 deletions
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index 9c40311cf..3e2a706d4 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -755,12 +755,15 @@ export function savePreferences(preferences, success, error) {
     );
 }
 
-export function getSuggestedCommands(command, suggestionId, component) {
-    client.listCommands(
+export function getSuggestedCommands(command, channelId, suggestionId, component) {
+    client.listCommands({
+            command: command,
+            channelId: channelId
+        },
         (data) => {
             var matches = [];
             data.forEach((cmd) => {
-                if (('/' + cmd.trigger).indexOf(command) === 0) {
+                if (('/' + cmd.trigger).indexOf(command) === 0 || cmd.external_management) {
                     let s = '/' + cmd.trigger;
                     let hint = '';
                     if (cmd.auto_complete_hint && cmd.auto_complete_hint.length !== 0) {
diff --git a/webapp/utils/client.jsx b/webapp/utils/client.jsx
index 9bd62e22d..ef6d496a2 100644
--- a/webapp/utils/client.jsx
+++ b/webapp/utils/client.jsx
@@ -1002,12 +1002,13 @@ export function regenCommandToken(data, success, error) {
     });
 }
 
-export function listCommands(success, error) {
+export function listCommands(data, success, error) {
     $.ajax({
         url: '/api/v1/commands/list',
         dataType: 'json',
         contentType: 'application/json',
-        type: 'GET',
+        type: 'POST',
+        data: JSON.stringify(data),
         success,
         error: function onError(xhr, status, err) {
             var e = handleError('listCommands', xhr, status, err);