diff --git a/.changelog/17319.txt b/.changelog/17319.txt
new file mode 100644
index 000000000..0cecdd827
--- /dev/null
+++ b/.changelog/17319.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fixed a handful of UX-related bugs during variable editing
+```
diff --git a/ui/app/components/variable-form.hbs b/ui/app/components/variable-form.hbs
index 0b1c2ed7f..7780f71a5 100644
--- a/ui/app/components/variable-form.hbs
+++ b/ui/app/components/variable-form.hbs
@@ -14,6 +14,17 @@
         Format: <code>nomad/jobs/&lt;jobname&gt;</code>, <code>nomad/jobs/&lt;jobname&gt;/&lt;groupname&gt;</code>, <code>nomad/jobs/&lt;jobname&gt;/&lt;groupname&gt;/&lt;taskname&gt;</code></p>
       </div>
     {{/unless}}
+
+    {{#if this.shouldShowLinkedEntities}}
+      <VariableForm::RelatedEntities
+        @new={{true}}
+        @job={{@model.pathLinkedEntities.job}}
+        @group={{@model.pathLinkedEntities.group}}
+        @task={{@model.pathLinkedEntities.task}}
+        @namespace={{this.variableNamespace}}
+      />
+    {{/if}}
+
   {{/if}}
 
   {{#if this.hasConflict}}
@@ -137,6 +148,7 @@
             class="delete-row button is-danger is-inverted"
             type="button"
             {{on "click" (action this.deleteRow entry)}}
+            disabled={{eq this.keyValues.length 1}}
           >
             Delete
           </button>
@@ -150,16 +162,6 @@
     {{/if}}
   {{/if}}
 
-  {{#if (and this.shouldShowLinkedEntities @model.isNew)}}
-    <VariableForm::RelatedEntities
-      @new={{true}}
-      @job={{@model.pathLinkedEntities.job}}
-      @group={{@model.pathLinkedEntities.group}}
-      @task={{@model.pathLinkedEntities.task}}
-      @namespace={{this.variableNamespace}}
-    />
-  {{/if}}
-
   <footer>
     {{#unless this.isJSONView}}
       {{#unless this.isJobTemplateVariable}}
diff --git a/ui/app/components/variable-form.js b/ui/app/components/variable-form.js
index 48a4b6499..889f8ec6c 100644
--- a/ui/app/components/variable-form.js
+++ b/ui/app/components/variable-form.js
@@ -140,7 +140,9 @@ export default class VariableFormComponent extends Component {
     let existingVariable = existingVariables
       .without(this.args.model)
       .find(
-        (v) => v.path === pathValue && v.namespace === this.variableNamespace
+        (v) =>
+          v.path === pathValue &&
+          (v.namespace === this.variableNamespace || !this.variableNamespace)
       );
     if (existingVariable) {
       return {
@@ -180,7 +182,10 @@ export default class VariableFormComponent extends Component {
   }
 
   @action appendRow() {
-    this.keyValues.pushObject(copy(EMPTY_KV));
+    // Clear our any entity errors
+    let newRow = copy(EMPTY_KV);
+    newRow.warnings = EmberObject.create();
+    this.keyValues.pushObject(newRow);
   }
 
   @action deleteRow(row) {
@@ -372,7 +377,8 @@ export default class VariableFormComponent extends Component {
     return (
       this.args.model.pathLinkedEntities?.job ||
       this.args.model.pathLinkedEntities?.group ||
-      this.args.model.pathLinkedEntities?.task
+      this.args.model.pathLinkedEntities?.task ||
+      trimPath([this.path]) === 'nomad/jobs'
     );
   }
 
diff --git a/ui/app/components/variable-form/related-entities.hbs b/ui/app/components/variable-form/related-entities.hbs
index 380cabfff..1ade67fae 100644
--- a/ui/app/components/variable-form/related-entities.hbs
+++ b/ui/app/components/variable-form/related-entities.hbs
@@ -12,7 +12,9 @@
     {{else if @group}}
     group <LinkTo @route="jobs.job.task-group" @models={{array (concat @job "@" @namespace) @group}}>{{@group}} <FlightIcon @name="external-link" /></LinkTo>
     {{else if @job}}
-    job <LinkTo @route="jobs.job" @model={{concat @job "@" @namespace}}>{{@job}} <FlightIcon @name="external-link" /></LinkTo><
+    job <LinkTo @route="jobs.job" @model={{concat @job "@" @namespace}}>{{@job}} <FlightIcon @name="external-link" /></LinkTo>
+    {{else}}
+    all nomad jobs in this namespace
     {{/if}}
 </span>
 </p>
diff --git a/ui/app/controllers/variables/variable/index.js b/ui/app/controllers/variables/variable/index.js
index 055d6ce17..8e713aac5 100644
--- a/ui/app/controllers/variables/variable/index.js
+++ b/ui/app/controllers/variables/variable/index.js
@@ -82,7 +82,8 @@ export default class VariablesVariableIndexController extends Controller {
     return (
       this.model.pathLinkedEntities?.job ||
       this.model.pathLinkedEntities?.group ||
-      this.model.pathLinkedEntities?.task
+      this.model.pathLinkedEntities?.task ||
+      this.model.path === 'nomad/jobs'
     );
   }