diff --git a/dojo/models.py b/dojo/models.py
index 375b59d6d7c..41c883e5bde 100755
--- a/dojo/models.py
+++ b/dojo/models.py
@@ -2802,13 +2802,18 @@ def get_file_path_with_link(self):
             return None
         if self.test.engagement.source_code_management_uri is None:
             return escape(self.file_path)
+        link = self.test.engagement.source_code_management_uri
         if "https://github.com/" in self.test.engagement.source_code_management_uri:
-            if self.test.engagement.commit_hash is not None:
-                link = self.test.engagement.source_code_management_uri + '/blob/' + self.test.engagement.commit_hash + '/' + self.file_path
+            if self.test.commit_hash is not None:
+                link += '/blob/' + self.test.commit_hash + '/' + self.file_path
+            elif self.test.engagement.commit_hash is not None:
+                link += '/blob/' + self.test.engagement.commit_hash + '/' + self.file_path
+            elif self.test.branch_tag is not None:
+                link += '/blob/' + self.test.branch_tag + '/' + self.file_path
             elif self.test.engagement.branch_tag is not None:
-                link = self.test.engagement.source_code_management_uri + '/blob/' + self.test.engagement.branch_tag + '/' + self.file_path
+                link += '/blob/' + self.test.engagement.branch_tag + '/' + self.file_path
         else:
-            link = self.test.engagement.source_code_management_uri + '/' + self.file_path
+            link += '/' + self.file_path
         if self.line:
             link = link + '#L' + str(self.line)
         return create_bleached_link(link, self.file_path)