diff --git a/.changelog/11358.txt b/.changelog/11358.txt
new file mode 100644
index 00000000000..9d77e06679f
--- /dev/null
+++ b/.changelog/11358.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Display client name as a tooltip where the client ID is used
+```
diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs
index 0fdc3174ecb..5c2a317b5d4 100644
--- a/ui/app/templates/components/allocation-row.hbs
+++ b/ui/app/templates/components/allocation-row.hbs
@@ -37,11 +37,23 @@
{{this.allocation.clientStatus}}
{{#if (eq this.context "volume")}}
-
{{this.allocation.node.shortId}} |
+
+
+
+ {{this.allocation.node.shortId}}
+
+
+ |
{{/if}}
{{#if (or (eq this.context "taskGroup") (eq this.context "job"))}}
{{this.allocation.jobVersion}} |
- {{this.allocation.node.shortId}} |
+
+
+
+ {{this.allocation.node.shortId}}
+
+
+ |
{{else if (or (eq this.context "node") (eq this.context "volume"))}}
{{#if (or this.allocation.job.isPending this.allocation.job.isReloading)}}
diff --git a/ui/app/templates/components/plugin-allocation-row.hbs b/ui/app/templates/components/plugin-allocation-row.hbs
index b1a10734a32..e0c5352a10c 100644
--- a/ui/app/templates/components/plugin-allocation-row.hbs
+++ b/ui/app/templates/components/plugin-allocation-row.hbs
@@ -44,7 +44,13 @@
|
- {{this.allocation.node.shortId}} |
+
+
+
+ {{this.allocation.node.shortId}}
+
+
+ |
{{#if (or this.allocation.job.isPending this.allocation.job.isReloading)}}
...
|