diff --git a/js/glowingbear.js b/js/glowingbear.js
index 506e7c3..fb928fc 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -309,7 +309,14 @@ function($rootScope,
                     // Switch to first buffer on startup
                     if (i === 0) {
                         models.setActiveBuffer(buffer.id);
+                        // Set setActiveBuffer emits a signal (activeBufferChanged)
+                        // The $rootScope.$on('activeBuffer...' should take care of
+                        // changing the buffer. However, and for a reason that I ignore
+                        // this signal is not sent on initialization
+                        $rootScope.connected = true;
+                        $location.path(buffer.fullName);
                     }
+
                 }
             });
 
@@ -334,9 +341,6 @@ function($rootScope,
                 weeChat.Protocol.formatSync({})
             );
 
-            $rootScope.connected = true;
-            $location.path('/connected');
-
         };
 
         var onmessage = function(event) {
diff --git a/templates/glowingbear.html b/templates/glowingbear.html
index 16ffed1..5105b34 100644
--- a/templates/glowingbear.html
+++ b/templates/glowingbear.html
@@ -113,7 +113,7 @@
         </form>
       </li>
       <li class="buffer" ng-class="{'active': content.active, 'indent': content.indent }" ng-repeat="(key, content) in buffers | toArray | filter:{fullName:search} | filter:hasUnread | orderBy:predicate">
-        <a href="#" ng-click="setActiveBuffer(content.id)" title="{{ content.fullName }}">
+        <a href="#/{{content.fullName}}" ng-click="setActiveBuffer(content.id)" title="{{ content.fullName }}">
           <span class="badge pull-right" ng-hide="content.notification" ng-if="content.unread" ng-bind="content.unread"></span>
           <span class="badge pull-right danger" ng-show="content.notification" ng-bind="content.notification"></span>
           <span class="buffername">{{ content.shortName }}</span><span ng-hide="content.shortName">{{ content.fullName }}</span>