diff --git a/scripts/js/settings-dhcp.js b/scripts/js/settings-dhcp.js
index ac773205..b60e05cc 100644
--- a/scripts/js/settings-dhcp.js
+++ b/scripts/js/settings-dhcp.js
@@ -430,3 +430,25 @@ $(document).on("click", ".copy-to-static", function () {
   const val = textarea.val();
   textarea.val(val ? val + "\n" + line : line).trigger("input");
 });
+
+// Add line numbers to the textarea for static DHCP hosts
+document.addEventListener("DOMContentLoaded", function () {
+  const textarea = document.getElementById("dhcp-hosts");
+  const linesElem = document.getElementById("dhcp-hosts-lines");
+  function updateLineNumbers() {
+    const lines = textarea.value.split("\n").length || 1;
+    linesElem.innerHTML = Array.from({ length: lines }, function (_, i) {
+      return i + 1;
+    }).join("<br>");
+  }
+
+  function syncScroll() {
+    linesElem.scrollTop = textarea.scrollTop;
+  }
+
+  if (textarea && linesElem) {
+    textarea.addEventListener("input", updateLineNumbers);
+    textarea.addEventListener("scroll", syncScroll);
+    updateLineNumbers();
+  }
+});
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 5c4af11c..5d8780ea 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -193,7 +193,10 @@ mg.include('scripts/lua/settings_header.lp','r')
                 <div class="row">
                     <div class="col-xs-12 col-md-6">
                         <p>Specify per host parameters for the DHCP server. This allows a machine with a particular hardware address to be always allocated the same hostname, IP address and lease time. A hostname specified like this overrides any supplied by the DHCP client on the machine. It is also allowable to omit the hardware address and include the hostname, in which case the IP address and lease times will apply to any machine claiming that name.</p>
-                        <textarea class="form-control field-sizing-content mb-4" id="dhcp-hosts" data-key="dhcp.hosts" style="resize: vertical;"></textarea>
+                        <div class="dhcp-hosts-wrapper mb-4" style="position:relative; display:flex;">
+                            <div id="dhcp-hosts-lines" aria-hidden="true" style="user-select:none; text-align:right; color:#aaa; border-right:1px solid #ddd; padding:8px 4px 8px 0; font-family:monospace; font-size:13px; min-width:2em;"></div>
+                            <textarea class="form-control field-sizing-content" id="dhcp-hosts" data-key="dhcp.hosts" style="resize: vertical; font-family:monospace; font-size:13px; width:100%;"></textarea>
+                        </div>
                         <p>Each entry should be on a separate line, and should be of the form:</p>
                         <pre>[&lt;hwaddr&gt;][,id:&lt;client_id&gt;|*][,set:&lt;tag&gt;][,tag:&lt;tag&gt;][,&lt;ipaddr&gt;][,&lt;hostname&gt;][,&lt;lease_time&gt;][,ignore]</pre>
                         <p>Only one entry per MAC address is allowed. IPv6 addresses must be enclosed in square brackets like <code>[2001:db8::1]</code>.</p>