diff --git a/index.html b/index.html
index e0d352c..cbd8fad 100644
--- a/index.html
+++ b/index.html
@@ -183,7 +183,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
           </a>
           <button ng-show="debugMode" ng-click="countWatchers()">Count<br />Watchers</button>
         </div>
-        <div class="title" ng-bind-html="activeBuffer().title | linky:'_blank'"></div>
+        <div class="title" ng-bind-html="activeBuffer().title | irclinky:'_blank'"></div>
         <div class="actions pull-right vertical-line-left">
           <div class="dropdown pull-left">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="Options menu">
@@ -286,7 +286,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
       <div bindonce id="bufferlines" class="monospace" ng-class="{'withnicklist': showNicklist}">
         <div id="nicklist" ng-show="showNicklist" class="vertical-line-left">
           <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist">
-            <li ng-repeat="nick in group.nicks|orderBy:'name'" ng-click="openQuery(nick.name)">
+            <li ng-repeat="nick in group.nicks|orderBy:'name'" ng-click="openBuffer(nick.name)">
               <a ng-click="nickAction(nick)"><span bo-class="nick.prefixClasses" bo-text="nick.prefix"></span><span bo-class="nick.nameClasses" bo-text="nick.name"></span></a>
             </li>
           </ul>
@@ -314,7 +314,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                 <div ng-repeat="metadata in bufferline.metadata">
                   <div plugin data="metadata"></div>
                 </div>
-                <span ng-repeat="part in bufferline.content" class="text" bo-class="part.classes" bo-html="part.text|linky:'_blank'"></span>
+                <span ng-repeat="part in bufferline.content" class="text" bo-class="part.classes" bo-html="part.text|irclinky:'_blank'"></span>
               </td>
             </tr>
             <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 22fe4d8..4cb399c 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -14,6 +14,26 @@ weechat.filter('toArray', function () {
     };
 });
 
+weechat.filter('irclinky', ['$filter', function($filter) {
+    'use strict';
+    return function(text, target) {
+        if (!text) {
+            return text;
+        }
+
+        var linkiedText = $filter('linky')(text, target);
+
+        // This regex should be accurate enough. Theoretically, a bunch of other characters is allowed as well
+        // (ASCII except for NULL, BELL, CR, LF, ' ', ',', and ':') and a channel could in theory start with
+        // \![A-Z0-9]{5} and then have up to 45 other characters. I doubt anyone uses that.
+        var channelRegex = /(^|\s)([#&+][a-z0-9-_]{1,49})/gmi;
+        // This is SUPER nasty, but ng-click does not work inside a filter, as the markup has to be $compiled first, which is not possible in filter afaik.
+        // Therefore, get the scope, fire the method, and $apply. Yuck. I sincerely hope someone finds a better way of doing this.
+        linkiedText = linkiedText.replace(channelRegex, '$1<a href="#" onclick="var $scope = angular.element(event.target).scope(); $scope.openBuffer(\'$2\'); $scope.$apply();">$2</a>');
+        return linkiedText;
+    };
+}]);
+
 weechat.factory('handlers', ['$rootScope', 'models', 'plugins', function($rootScope, models, plugins) {
 
     var handleBufferClosing = function(message) {
@@ -588,12 +608,16 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         return models.setActiveBuffer(bufferId, key);
     };
 
-    $scope.openQuery = function(nick) {
-        var buffName = models.getActiveBuffer().fullName;
-        buffName = buffName.substring(0, buffName.lastIndexOf('.')) + '.' + nick;
+    $scope.openBuffer = function(bufferName) {
+        var fullName = models.getActiveBuffer().fullName;
+        fullName = fullName.substring(0, fullName.lastIndexOf('.') + 1) + bufferName;  // substitute the last part
 
-        if (!$scope.setActiveBuffer(buffName, 'fullName')) {
-            connection.sendMessage('/query ' + nick);
+        if (!$scope.setActiveBuffer(fullName, 'fullName')) {
+            var command = 'join';
+            if (['#', '&', '+', '!'].indexOf(bufferName.charAt(0)) < 0) {  // these are the characters a channel name can start with (RFC 2813-2813)
+                command = 'query';
+            }
+            connection.sendMessage('/' + command + ' ' + bufferName);
         }
     };