diff --git a/ui/src/lib/company-routes.test.ts b/ui/src/lib/company-routes.test.ts
index 6278224db81..91751af8634 100644
--- a/ui/src/lib/company-routes.test.ts
+++ b/ui/src/lib/company-routes.test.ts
@@ -72,6 +72,16 @@ describe("company routes", () => {
     expect(toCompanyRelativePath("/PAP/artifacts")).toBe("/artifacts");
   });
 
+  it("treats /tools routes as board routes that need a company prefix", () => {
+    expect(isBoardPathWithoutPrefix("/tools")).toBe(true);
+    expect(isBoardPathWithoutPrefix("/tools/runtime")).toBe(true);
+    expect(extractCompanyPrefixFromPath("/tools")).toBeNull();
+    expect(applyCompanyPrefix("/tools", "PAP")).toBe("/PAP/tools");
+    expect(applyCompanyPrefix("/tools/runtime", "PAP")).toBe("/PAP/tools/runtime");
+    expect(applyCompanyPrefix("/PAP/tools/runtime", "PAP")).toBe("/PAP/tools/runtime");
+    expect(toCompanyRelativePath("/PAP/tools/runtime")).toBe("/tools/runtime");
+  });
+
   it("preserves artifact deep-link anchors when applying the company prefix", () => {
     expect(applyCompanyPrefix("/issues/PAP-10205#work-product-wp-1", "PAP")).toBe(
       "/PAP/issues/PAP-10205#work-product-wp-1",
diff --git a/ui/src/lib/company-routes.ts b/ui/src/lib/company-routes.ts
index bc6d28b4484..aa82480c136 100644
--- a/ui/src/lib/company-routes.ts
+++ b/ui/src/lib/company-routes.ts
@@ -13,6 +13,7 @@ const BOARD_ROUTE_ROOTS = new Set([
   "routines",
   "goals",
   "artifacts",
+  "tools",
   "approvals",
   "costs",
   "usage",