diff --git a/packages/web_ui/src/components/InstanceList.tsx b/packages/web_ui/src/components/InstanceList.tsx
index 45919f64..630d349e 100644
--- a/packages/web_ui/src/components/InstanceList.tsx
+++ b/packages/web_ui/src/components/InstanceList.tsx
@@ -59,12 +59,12 @@ export default function InstanceList(props: InstanceListProps) {
 			key: "assignedHost",
 			className: "table-link-cell",
 			render: (_, instance) => <Space>
-				<Link
+				{instance.assignedHost !== undefined && <Link
 					to={`/hosts/${instance.assignedHost}/view`}
 					onClick={e => e.stopPropagation()}
 				>
 					{hostName(instance.assignedHost)}
-				</Link>
+				</Link>}
 				<RestartRequired system={instance.assignedHost ? systems.get(instance.assignedHost) : undefined}/>
 			</Space>,
 			sorter: (a, b) => strcmp(hostName(a.assignedHost), hostName(b.assignedHost)),
diff --git a/packages/web_ui/src/style.css b/packages/web_ui/src/style.css
index f574c1b1..8fc041c2 100644
--- a/packages/web_ui/src/style.css
+++ b/packages/web_ui/src/style.css
@@ -10,15 +10,12 @@ body {
 	cursor: pointer;
 }
 
-/* Make a table name-cell link fill the whole cell, so the entire cell is
-   clickable and right-click "open in new tab"-able, not just the text. */
-.table-link-cell {
-	position: relative;
-}
-.table-link-cell a::after {
-	content: "";
-	position: absolute;
-	inset: 0;
+/* Make a table link-cell's link fill the cell width, so the whole column
+   width is clickable and right-click "open in new tab"-able, not just the
+   text. Uses display:block rather than an overlay so sibling content (e.g.
+   the restart-required icon) stays interactive. */
+.table-link-cell a {
+	display: block;
 }
 
 .login-container {