diff --git a/awx/ui/client/src/notifications/notifications.list.js b/awx/ui/client/src/notifications/notifications.list.js
index 24e1aa35c7..74a809444d 100644
--- a/awx/ui/client/src/notifications/notifications.list.js
+++ b/awx/ui/client/src/notifications/notifications.list.js
@@ -25,7 +25,7 @@ export default ['i18n', 'templateUrl', function(i18n, templateUrl){
                 key: true,
                 label: i18n._('Name'),
                 columnClass: 'col-md-3 col-sm-9 col-xs-9',
-                linkTo: '/#/notification_templates/{{notifier.id}}'
+                linkTo: '/#/notification_templates/{{notification.id}}'
             },
             notification_type: {
                 label: i18n._('Type'),
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index 2967ffaba5..445352fef3 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -278,7 +278,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
         restrict: 'A',
         link: function(scope, element, attrs) {
             element.bind('click', function(event) {
-                if (attrs.disableRow) {
+                if (scope.$eval(attrs.disableRow)) {
                     event.preventDefault();
                 }
                 return;
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index 00e423a95b..64bd243d72 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -322,8 +322,8 @@ export default ['$compile', 'Attr', 'Icon',
                 innerTable += "]\" ";
                 innerTable += "id=\"{{ " + list.iterator + ".id }}\" ";
                 innerTable += "class=\"List-tableRow " + list.iterator + "_class\" ";
-                innerTable += "ng-repeat=\"" + list.iterator + " in " + list.name + "\"";
-                innerTable += (list.disableRow) ? " disable-row=" + list.disableRow + " " : "";
+                innerTable += (list.disableRow) ? " disable-row=\"" + list.disableRow + "\" " : "";
+                innerTable += "ng-repeat=\"" + list.iterator + " in " + list.name;
                 innerTable += (list.trackBy) ? " track by " + list.trackBy : "";
                 innerTable += (list.orderBy) ? " | orderBy:'" + list.orderBy + "'" : "";
                 innerTable += (list.filterBy) ? " | filter: " + list.filterBy : "";