diff --git a/lemur/static/app/angular/certificates/view/view.js b/lemur/static/app/angular/certificates/view/view.js
index 0008dd64..6712e62a 100644
--- a/lemur/static/app/angular/certificates/view/view.js
+++ b/lemur/static/app/angular/certificates/view/view.js
@@ -17,7 +17,7 @@ angular.module('lemur')
       });
   })
 
-  .controller('CertificatesViewController', function ($q, $scope, $uibModal, $stateParams, CertificateApi, CertificateService, MomentService, ngTableParams, toaster) {
+  .controller('CertificatesViewController', function ($q, $scope, $uibModal, $stateParams, $location, CertificateApi, CertificateService, MomentService, ngTableParams, toaster) {
     $scope.filter = $stateParams;
     $scope.certificateTable = new ngTableParams({
       page: 1,            // show first page
@@ -29,11 +29,24 @@ angular.module('lemur')
     }, {
       total: 0,           // length of data
       getData: function ($defer, params) {
-        CertificateApi.getList(params.url())
-          .then(function (data) {
-            params.total(data.total);
-            $defer.resolve(data);
-          });
+        $scope.path = $location.path();
+        // Handle Permalink clicks through a separate API
+        // Clicking on Permalink adds the certificate name to the URL after "certificates/", which is used to identify the click
+        if ($scope.path.indexOf('certificates/') > -1 && $scope.path.split('/')[2].length > 0) {
+          $scope.certificateName = $scope.path.split('/')[2];
+          CertificateApi.one('name').one($scope.certificateName).getList()
+            .then(function (data) {
+              params.total(data.total);
+              $defer.resolve(data);
+            });
+        }
+        else {
+          CertificateApi.getList(params.url())
+              .then(function (data) {
+                params.total(data.total);
+                $defer.resolve(data);
+              });
+        }
       }
     });