diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index ca3a010791..4eb2adad5d 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -354,8 +354,12 @@ module.exports = {
     },
 
     getCommandList: function() {
-        return Object.keys(commands).sort().map(function(cmdKey) {
+        // Return all the commands plus /me which isn't handled like normal commands
+        var cmds = Object.keys(commands).sort().map(function(cmdKey) {
             return commands[cmdKey];
-        });
+        })
+        cmds.push(new Command("me", "<action>", function(){}));
+
+        return cmds;
     }
 };