diff --git a/CHANGELOG.md b/CHANGELOG.md
index f14db0e109..ddea74a352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#7037](https://github.com/apache/trafficcontrol/pull/7037) *Traffic Router* Uses Traffic Ops API 4.0 by default
 
 ### Fixed
+- [#7080](https://github.com/apache/trafficcontrol/issues/7080), [#6335](https://github.com/apache/trafficcontrol/issues/6335) *Traffic Portal* Fixed redirect links for server capability.
 - [#7022](https://github.com/apache/trafficcontrol/pull/7022) *Traffic Stats* Reuse InfluxDB client handle to prevent potential connection leaks.
 - [#7021](https://github.com/apache/trafficcontrol/issues/7021) *Cache Config* Fixed cache config for Delivery Services with IP Origins.
 - [#7043](https://github.com/apache/trafficcontrol/issues/7043) Fixed cache config missing retry parameters for non-topology MSO Delivery Services going direct from edge to origin.
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/TableDeliveryServiceCapabilitiesController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/TableDeliveryServiceCapabilitiesController.js
index c04ae53e00..1efcc768f8 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/TableDeliveryServiceCapabilitiesController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/TableDeliveryServiceCapabilitiesController.js
@@ -92,7 +92,7 @@ var TableDeliveryServiceCapabilitiesController = function(deliveryService, requi
 	};
 
 	$scope.editServerCapability = function(capabilityName) {
-		locationUtils.navigateToPath('/server-capabilities/' + capabilityName);
+		locationUtils.navigateToPath('/server-capabilities/edit?name=' + capabilityName);
 	};
 
 	$scope.refresh = function() {
diff --git a/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/table.serverCapabilityDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/table.serverCapabilityDeliveryServices.tpl.html
index 232c57cfa5..43079c3d72 100644
--- a/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/table.serverCapabilityDeliveryServices.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/table.serverCapabilityDeliveryServices.tpl.html
@@ -21,7 +21,7 @@
     <div class="x_title">
         <ol class="breadcrumb pull-left">
             <li><a ng-click="navigateToPath('/server-capabilities')">Server Capabilities</a></li>
-            <li><a ng-click="navigateToPath('/server-capabilities/' + serverCapability.name)">{{::serverCapability.name}}</a></li>
+            <li><a ng-click="navigateToPath('/server-capabilities/edit?name=' + serverCapability.name)">{{::serverCapability.name}}</a></li>
             <li class="active">Delivery Services</li>
         </ol>
         <div class="pull-right">
diff --git a/traffic_portal/app/src/common/modules/table/serverCapabilityServers/table.serverCapabilityServers.tpl.html b/traffic_portal/app/src/common/modules/table/serverCapabilityServers/table.serverCapabilityServers.tpl.html
index b85205b251..a028af4e88 100644
--- a/traffic_portal/app/src/common/modules/table/serverCapabilityServers/table.serverCapabilityServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/serverCapabilityServers/table.serverCapabilityServers.tpl.html
@@ -21,7 +21,7 @@
     <div class="x_title">
         <ol class="breadcrumb pull-left">
             <li><a href="#!/server-capabilities">Server Capabilities</a></li>
-            <li><a ng-href="#!/server-capabilities/{{serverCapability.name}}">{{::serverCapability.name}}</a></li>
+            <li><a ng-href="#!/server-capabilities/edit?name={{serverCapability.name}}">{{::serverCapability.name}}</a></li>
             <li class="active">Servers</li>
         </ol>
         <div class="pull-right">
diff --git a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
index c37e69f9ac..d79c1f95ed 100644
--- a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
+++ b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
@@ -121,7 +121,7 @@ var TableServerServerCapabilitiesController = function(server, serverCapabilitie
 	};
 
 	$scope.editServerCapability = function(capabilityName) {
-		locationUtils.navigateToPath('/server-capabilities/' + capabilityName);
+		locationUtils.navigateToPath('/server-capabilities/edit?name=' + capabilityName);
 	};
 
 	$scope.refresh = function() {