2 files changed, 10 insertions, 5 deletions
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx
index 78df1ff17..1df0d12f5 100644
--- a/webapp/actions/channel_actions.jsx
+++ b/webapp/actions/channel_actions.jsx
@@ -66,12 +66,10 @@ export function executeCommand(message, args, success, error) {
             const err = {message: Utils.localizeMessage('create_post.shortcutsNotSupported', 'Keyboard shortcuts are not supported on your device')};
             error(err);
             return;
-        } else if (Utils.isMac()) {
-            msg += ' mac';
-        } else if (message.indexOf('mac') !== -1) {
-            msg = '/shortcuts';
         }
-        break;
+
+        GlobalActions.showShortcutsModal();
+        return;
     case '/leave': {
         // /leave command not supported in reply threads.
         if (args.channel_id && (args.root_id || args.parent_id)) {
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index a163db126..0b7c8f7b1 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -211,6 +211,13 @@ export function showAccountSettingsModal() {
     });
 }
 
+export function showShortcutsModal() {
+    AppDispatcher.handleViewAction({
+        type: ActionTypes.TOGGLE_SHORTCUTS_MODAL,
+        value: true
+    });
+}
+
 export function showDeletePostModal(post, commentCount = 0) {
     AppDispatcher.handleViewAction({
         type: ActionTypes.TOGGLE_DELETE_POST_MODAL,