diff --git a/frontend-modern/src/components/Settings/ConfiguredNodeTables.tsx b/frontend-modern/src/components/Settings/ConfiguredNodeTables.tsx
index 9bca4865e..fabcb731a 100644
--- a/frontend-modern/src/components/Settings/ConfiguredNodeTables.tsx
+++ b/frontend-modern/src/components/Settings/ConfiguredNodeTables.tsx
@@ -93,7 +93,7 @@ const resolvePveStatusMeta = (
 export const PveNodesTable: Component<PveNodesTableProps> = (props) => {
   return (
     <Card padding="none" tone="glass" class="overflow-x-auto rounded-lg">
-      <table class="min-w-[900px] divide-y divide-gray-200 dark:divide-gray-700 text-sm">
+      <table class="w-full min-w-[900px] divide-y divide-gray-200 dark:divide-gray-700 text-sm">
         <thead class="bg-gray-50 dark:bg-gray-800/70">
           <tr>
             <th scope="col" class="py-2 pl-4 pr-3 text-left text-xs font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">
@@ -374,7 +374,7 @@ const resolvePbsStatusMeta = (
 export const PbsNodesTable: Component<PbsNodesTableProps> = (props) => {
   return (
     <Card padding="none" tone="glass" class="overflow-x-auto rounded-lg">
-      <table class="min-w-[900px] divide-y divide-gray-200 dark:divide-gray-700 text-sm">
+      <table class="w-full min-w-[900px] divide-y divide-gray-200 dark:divide-gray-700 text-sm">
         <thead class="bg-gray-50 dark:bg-gray-800/70">
           <tr>
             <th scope="col" class="py-2 pl-4 pr-3 text-left text-xs font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">
@@ -570,7 +570,7 @@ const resolvePmgStatusMeta = (
 export const PmgNodesTable: Component<PmgNodesTableProps> = (props) => {
   return (
     <Card padding="none" tone="glass" class="overflow-x-auto rounded-lg">
-      <table class="min-w-[900px] divide-y divide-gray-200 dark:divide-gray-700 text-sm">
+      <table class="w-full min-w-[900px] divide-y divide-gray-200 dark:divide-gray-700 text-sm">
         <thead class="bg-gray-50 dark:bg-gray-800/70">
           <tr>
             <th scope="col" class="py-2 pl-4 pr-3 text-left text-xs font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">
diff --git a/internal/api/system_settings.go b/internal/api/system_settings.go
index e4aadc6d5..11384900b 100644
--- a/internal/api/system_settings.go
+++ b/internal/api/system_settings.go
@@ -431,6 +431,8 @@ func (h *SystemSettingsHandler) HandleGetSystemSettings(w http.ResponseWriter, r
 		settings.TemperatureMonitoringEnabled = h.config.TemperatureMonitoringEnabled
 		// Expose Docker update actions setting (respects env override)
 		settings.DisableDockerUpdateActions = h.config.DisableDockerUpdateActions
+		// Expose public URL so the frontend can display it when env-overridden
+		settings.PublicURL = h.config.PublicURL
 	}
 
 	// Include env override information