diff --git a/src/_includes/combined_ranking_table.html b/src/_includes/combined_ranking_table.html
index 596f7729..d5858b3d 100644
--- a/src/_includes/combined_ranking_table.html
+++ b/src/_includes/combined_ranking_table.html
@@ -83,7 +83,9 @@
           tooltip: 'Affiliation',
           formatter: function(cell) {
             var d = cell.getRow().getData();
-            return escHtml((d.display_affiliation || d.affiliation || '').replace(/^_/, ''));
+            var aff = (d.display_affiliation || d.affiliation || '').replace(/^_/, '');
+            var url = baseUrl + '/profile.html?type=institution&name=' + encodeURIComponent(d.affiliation || '');
+            return '<a href="' + url + '">' + escHtml(aff) + '</a>';
           }
         },
         { title: 'S', field: 'combined_score', sorter: 'number', width: 45,
diff --git a/src/assets/js/reprodb-profile-page.js b/src/assets/js/reprodb-profile-page.js
index 2c05e5d7..bda61e88 100644
--- a/src/assets/js/reprodb-profile-page.js
+++ b/src/assets/js/reprodb-profile-page.js
@@ -56,7 +56,12 @@
     else if (p.category === 'systems') catTag = '<span class="category-tag cat-systems">Systems</span>';
     else if (p.category === 'security') catTag = '<span class="category-tag cat-security">Security</span>';
     document.getElementById('prof-name').innerHTML = escHtml(cleanName(p.name)) + catTag;
-    document.getElementById('prof-affil').textContent = p.affiliation || '';
+    var affilEl = document.getElementById('prof-affil');
+    if (p.affiliation) {
+      affilEl.innerHTML = '<a href="' + baseUrl + '/profile.html?type=institution&name=' + encodeURIComponent(p.affiliation) + '">' + escHtml(p.affiliation) + '</a>';
+    } else {
+      affilEl.textContent = '';
+    }
 
     // Score cards
     var c = '';