diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
index ec84fa959c..1caba245f0 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
@@ -1,8 +1,10 @@
 capacity-bar {
 
     width: 50%;
-    margin-right: 10px;
+    margin-right: 25px;
     min-width: 100px;
+    display: flex;
+    align-items: center;
 
     .CapacityBar {
         background-color: @default-bg;
@@ -13,6 +15,7 @@ capacity-bar {
         width: 100%;
         border-radius: 100vw;
         overflow: hidden;
+        margin-right: 10px;
     }
 
     .CapacityBar-remaining {
@@ -31,4 +34,8 @@ capacity-bar {
             background-color: @d7grey;
         }
     }
+
+    .Capacity-details--percentage {
+        color: @default-data-txt;
+    }
 }
diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
index 4999afa3e9..a0616bb646 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
@@ -19,9 +19,19 @@ export default ['templateUrl',
                 }, true);
 
                 scope.$watch('capacity', function() {
-                    scope.CapacityStyle = {
-                        'flex-grow': scope.capacity * 0.01
-                    };
+                    if (scope.totalCapacity !== 0) {
+                        scope.CapacityStyle = {
+                            'flex-grow': scope.capacity * 0.01
+                        };
+
+                        scope.consumedCapacity = `${scope.capacity}%`;
+                    } else {
+                        scope.CapacityStyle = {
+                            'flex-grow': 1
+                        };
+
+                        scope.consumedCapacity = null;
+                    }
                 }, true);
             }
         };
diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
index c759bbebd1..ab4bc5b5a5 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
@@ -1,5 +1,6 @@
 <div class="CapacityBar"
-    ng-class="{'CapacityBar--offline': isOffline">
+    ng-class="{'CapacityBar--offline': isOffline}">
         <div class="CapacityBar-remaining" ng-style="CapacityStyle"></div>
         <div class="CapacityBar-consumed"></div>
 </div>
+<span class="Capacity-details--percentage" ng-show="consumedCapacity">{{ consumedCapacity }}</span>
diff --git a/awx/ui/client/src/instance-groups/instance-group.block.less b/awx/ui/client/src/instance-groups/instance-group.block.less
index 4fa4a1b49d..22b81417ea 100644
--- a/awx/ui/client/src/instance-groups/instance-group.block.less
+++ b/awx/ui/client/src/instance-groups/instance-group.block.less
@@ -24,10 +24,6 @@
             margin: 0 10px 0 0;
             width: 100px;
         }
-
-        .Capacity-details--percentage {
-            color: @default-data-txt;
-        }
     }
 
     .RunningJobs-details {
diff --git a/awx/ui/client/src/instance-groups/instance-group.partial.html b/awx/ui/client/src/instance-groups/instance-group.partial.html
index 04c9554e25..df3be6f2ca 100644
--- a/awx/ui/client/src/instance-groups/instance-group.partial.html
+++ b/awx/ui/client/src/instance-groups/instance-group.partial.html
@@ -9,7 +9,6 @@
                     <div class="Capacity-details">
                         <p class="Capacity-details--label" translate>Used Capacity</p>
                         <capacity-bar capacity="instanceGroupCapacity" total-capacity="instanceGroupTotalCapacity"></capacity-bar>
-                        <span class="Capacity-details--percentage">{{ instanceGroupCapacity }}%</span>
                     </div>
                     <div class="RunningJobs-details">
                         <p class="RunningJobs-details--label" translate>Running Jobs</p>
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
index 6db925c943..9c40fe931f 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
@@ -9,7 +9,6 @@
                     <div class="Capacity-details">
                         <p class="Capacity-details--label" translate>Used Capacity</p>
                         <capacity-bar capacity="instanceCapacity" total-capacity="instanceTotalCapacity"></capacity-bar>
-                        <span class="Capacity-details--percentage">{{ instanceCapacity }}%</span>
                     </div>
                     <div class="RunningJobs-details">
                         <p class="RunningJobs-details--label" translate>Running Jobs</p>
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index eed226a5ce..da8f052423 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -35,7 +35,7 @@
                         </a>
                     </td>
                     <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
-                        <capacity-bar capacity="instance.consumed_capacity" total-capacity="instance.capacity"></capacity-bar><span>{{ instance.consumed_capacity }}%</span>
+                        <capacity-bar capacity="instance.consumed_capacity" total-capacity="instance.capacity">
                     </td>
                 </tr>
             </tbody>
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index d036d666de..f3d470afd9 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -47,7 +47,7 @@
                     </a>
                 </td>
                 <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
-                    <capacity-bar capacity="instance_group.consumed_capacity" total-capacity="instance_group.capacity"></capacity-bar><span>{{ instance_group.consumed_capacity }}%</span>
+                    <capacity-bar capacity="instance_group.consumed_capacity" total-capacity="instance_group.capacity"></capacity-bar>
                 </td>
             </tr>
         </tbody>