diff --git a/rhodecode/controllers/branches.py b/rhodecode/controllers/branches.py
--- a/rhodecode/controllers/branches.py
+++ b/rhodecode/controllers/branches.py
@@ -30,13 +30,12 @@ import logging
 from pylons import tmpl_context as c
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import OrderedDict
-from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
-class BranchesController(BaseController):
+class BranchesController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -45,9 +44,9 @@ class BranchesController(BaseController)
         super(BranchesController, self).__before__()
 
     def index(self):
-        c.repo_info, dbrepo = ScmModel().get(c.repo_name, retval='repo')
+
         c.repo_branches = OrderedDict()
-        for name, hash_ in c.repo_info.branches.items():
-            c.repo_branches[name] = c.repo_info.get_changeset(hash_)
+        for name, hash_ in c.rhodecode_repo.branches.items():
+            c.repo_branches[name] = c.rhodecode_repo.get_changeset(hash_)
 
         return render('branches/branches.html')