diff --git a/.changelog/19051.txt b/.changelog/19051.txt
new file mode 100644
index 000000000..a259edf28
--- /dev/null
+++ b/.changelog/19051.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: for system and sysbatch jobs, now show client name on hover in job panel
+```
diff --git a/ui/app/components/job-status/individual-allocation.hbs b/ui/app/components/job-status/individual-allocation.hbs
index aed881622..323645b57 100644
--- a/ui/app/components/job-status/individual-allocation.hbs
+++ b/ui/app/components/job-status/individual-allocation.hbs
@@ -2,8 +2,9 @@
   Copyright (c) HashiCorp, Inc.
   SPDX-License-Identifier: BUSL-1.1
 ~}}
-
-<Hds::TooltipButton @text="{{get @allocation "shortId"}}" aria-label="Allocation" @extraTippyOptions={{hash trigger=(if (eq @status "unplaced") "manual")}}>
+<Hds::TooltipButton
+  @text="{{if this.showClient (concat this.nodeName " - " (get @allocation "shortId")) (get @allocation "shortId")}}"
+aria-label="Allocation" @extraTippyOptions={{hash trigger=(if (eq @status "unplaced") "manual")}}>
   <ConditionalLinkTo
     @condition={{not (eq @status "unplaced")}}
     @route="allocations.allocation"
diff --git a/ui/app/components/job-status/individual-allocation.js b/ui/app/components/job-status/individual-allocation.js
new file mode 100644
index 000000000..a0d78a2bd
--- /dev/null
+++ b/ui/app/components/job-status/individual-allocation.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+// @ts-check
+import Component from '@glimmer/component';
+import { alias } from '@ember/object/computed';
+
+export default class JobStatusIndividualAllocationComponent extends Component {
+  @alias('args.allocation.job.type') jobType;
+  @alias('args.allocation.node.name') nodeName;
+
+  get showClient() {
+    return this.jobType === 'system' || this.jobType === 'sysbatch';
+  }
+}