diff --git a/assets/js/client.js b/assets/js/client.js
index f8304ec..8ae2d86 100644
--- a/assets/js/client.js
+++ b/assets/js/client.js
@@ -460,6 +460,7 @@ $(function() {
 
     irc.socket.emit('join', connect);
   });
+  irc.commands.alias('j', 'join');
 
   irc.commands.add('list', function(args){
     irc.socket.emit('list', args);
@@ -498,6 +499,7 @@ $(function() {
         topic: args.join(' ')});
     }
   });
+  irc.commands.alias("t", "topic");
 
   irc.commands.add('whois', function(args){
     if (args[0]){
@@ -526,6 +528,7 @@ $(function() {
   });
   irc.commands.alias('msg', 'query');
   irc.commands.alias('privmsg', 'query');
+  irc.commands.alias('q', 'query');
 
   irc.commands.add('default', function(args, command){
     command = command.substr(1).toUpperCase();