diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 75a9f7a..7130305 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -145,6 +145,7 @@
                     repo=repo.name,
                     username=username,
                     namespace=repo.namespace,
+                    identifier=branchname,
                     filename=filename) | unicode }}" title="View git blame">Blame</a>
 
                 <a class="btn btn-secondary btn-sm" href="{{ url_for(
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index b0cce44..a029bb5 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -679,7 +679,12 @@ def view_blame_file(repo, filename, username=None, namespace=None):
     if repo_obj.is_empty or repo_obj.head_is_unborn:
         flask.abort(404, 'Empty repo cannot have a file')
 
-    commit = repo_obj[repo_obj.head.target]
+    if branchname in repo_obj.listall_branches():
+        branch = repo_obj.lookup_branch(branchname)
+        commit = branch.get_object()
+    else:
+        commit = repo_obj[repo_obj.head.target]
+
     content = __get_file_in_tree(
         repo_obj, commit.tree, filename.split('/'), bail_on_tree=True)
     if not content:
@@ -703,7 +708,7 @@ def view_blame_file(repo, filename, username=None, namespace=None):
         lexer,
         HtmlFormatter(noclasses=True, style="tango")
     )
-    blame = repo_obj.blame(filename)
+    blame = repo_obj.blame(filename, newest_commit=commit.oid.hex)
 
     return flask.render_template(
         'blame.html',
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index e41b08b..563aa99 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -14,6 +14,7 @@ import pkg_resources
 import datetime
 import json
 import unittest
+import re
 import shutil
 import sys
 import tempfile
@@ -2072,6 +2073,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         # Add some content to the git repo
         tests.add_content_git_repo(os.path.join(self.path, 'repos',
                                                 'test.git'))
+        tests.add_content_git_repo(
+            os.path.join(self.path, 'repos','test.git'),
+            branch='feature')
         tests.add_readme_git_repo(os.path.join(self.path, 'repos', 'test.git'))
         tests.add_binary_git_repo(
             os.path.join(self.path, 'repos', 'test.git'), 'test.jpg')
@@ -2080,8 +2084,9 @@ class PagureFlaskRepotests(tests.Modeltests):
 
         output = self.app.get('/test/blame/foofile')
         self.assertEqual(output.status_code, 404)
+        regex = re.compile('>(\w+)</a></td>\n<td class="cell2">')
 
-        # View in a branch
+        # View in master branch
         output = self.app.get('/test/blame/sources')
         self.assertEqual(output.status_code, 200)
         self.assertIn(b'<table class="code_table">', output.data)
@@ -2090,6 +2095,21 @@ class PagureFlaskRepotests(tests.Modeltests):
             b'data-line-number="1"></a></td>', output.data)
         self.assertIn(
             b'<td class="cell2"><pre> bar</pre></td>', output.data)
+        data = regex.findall(output.data)
+        self.assertEqual(len(data), 2)
+
+        # View in feature branch
+        output = self.app.get('/test/blame/sources?identifier=feature')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn(b'<table class="code_table">', output.data)
+        self.assertIn(
+            b'<tr><td class="cell1"><a id="1" href="#1" '
+            b'data-line-number="1"></a></td>', output.data)
+        self.assertIn(
+            b'<td class="cell2"><pre> bar</pre></td>', output.data)
+        data2 = regex.findall(output.data)
+        self.assertEqual(len(data2), 2)
+        self.assertNotEqual(data, data2)
 
         # View what's supposed to be an image
         output = self.app.get('/test/blame/test.jpg')