diff --git a/ui/app/components/allocation-service-sidebar.hbs b/ui/app/components/allocation-service-sidebar.hbs
index c77b089b0..b0dd974de 100644
--- a/ui/app/components/allocation-service-sidebar.hbs
+++ b/ui/app/components/allocation-service-sidebar.hbs
@@ -77,12 +77,15 @@
 						<span class="term">
 							Client
 						</span>
-						<LinkTo
-							@route="clients.client"
-							@model={{@allocation.node}}
-						>
-							{{@allocation.node.shortId}}
-						</LinkTo>
+						<Tooltip @text={{@allocation.node.name}}>
+							<LinkTo
+								@route="clients.client"
+								@model={{@allocation.node}}
+							>
+								{{@allocation.node.shortId}}
+							</LinkTo>
+						</Tooltip>
+
 					</span>
 
 				</div>
diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index 7bade966f..324f01b4c 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -114,13 +114,15 @@
         <span class="term">
           Client
         </span>
-        <LinkTo
-          @route="clients.client"
-          @model={{this.model.node}}
-          data-test-client-link
-        >
-          {{this.model.node.shortId}}
-        </LinkTo>
+        <Tooltip @text={{this.model.node.name}}>
+          <LinkTo
+            @route="clients.client"
+            @model={{this.model.node}}
+            data-test-client-link
+          >
+            {{this.model.node.shortId}}
+          </LinkTo>
+        </Tooltip>
       </span>
     </div>
   </div>
diff --git a/ui/app/templates/components/job-service-row.hbs b/ui/app/templates/components/job-service-row.hbs
index 8b9403d82..4f99bdca9 100644
--- a/ui/app/templates/components/job-service-row.hbs
+++ b/ui/app/templates/components/job-service-row.hbs
@@ -31,7 +31,9 @@
 		{{@service.level}}
 	</td>
   <td>
-		<LinkTo @route="clients.client" @model={{@service.instances.0.node.id}}>{{@service.instances.0.node.shortId}}</LinkTo>
+		<Tooltip @text={{@service.instances.0.node.name}}>
+			<LinkTo @route="clients.client" @model={{@service.instances.0.node.id}}>{{@service.instances.0.node.shortId}}</LinkTo>
+		</Tooltip>
   </td>
   <td>
     {{#each @service.tags as |tag|}}