diff --git a/index.html b/index.html
index 6c360cc..a2a8612 100644
--- a/index.html
+++ b/index.html
@@ -357,7 +357,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                   <div class="checkbox">
                     <label>
                       <input type="checkbox" ng-model="orderbyserver">
-                      Order channels by server
+                      Hierarchical buffer view (order by server)
                     </label>
                   </div>
                 </form>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index e8e8a54..975ffd8 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -846,7 +846,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Save setting for displaying embeds
     $store.bind($scope, "noembed", noembed);
     // Save setting for channel ordering
-    $store.bind($scope, "orderbyserver", false);
+    $store.bind($scope, "orderbyserver", true);
     // Save setting for updating favicon
     $store.bind($scope, "useFavico", true);
     // Save setting for showtimestamp