diff --git a/package-lock.json b/package-lock.json
index 108cd3f7..def85d54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,8 @@
       "version": "21.3.6",
       "license": "MIT",
       "dependencies": {
-        "@primer/primitives": "^8.2.0",
-        "@primer/view-components": "^0.30.0"
+        "@primer/primitives": "^9.0.3",
+        "@primer/view-components": "^0.32.0"
       },
       "devDependencies": {
         "@changesets/changelog-github": "^0.5.0",
@@ -1384,9 +1384,9 @@
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz",
-      "integrity": "sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.1.tgz",
+      "integrity": "sha512-lSquqZCHxDfuTg/Sk2hiS0mcSFCEBuj49JfzPHJogDBT0mGCyY5A1AQzBWngitrp7i1/HAZpIgzF/VjhOEIJIg==",
       "dev": true,
       "funding": [
         {
@@ -1399,16 +1399,16 @@
         }
       ],
       "engines": {
-        "node": "^14 || ^16 || >=18"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^2.4.1"
+        "@csstools/css-tokenizer": "^3.0.1"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz",
-      "integrity": "sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.1.tgz",
+      "integrity": "sha512-UBqaiu7kU0lfvaP982/o3khfXccVlHPWp0/vwwiIgDF0GmqqqxoiXC/6FCjlS9u92f7CoEz6nXKQnrn1kIAkOw==",
       "dev": true,
       "funding": [
         {
@@ -1421,13 +1421,13 @@
         }
       ],
       "engines": {
-        "node": "^14 || ^16 || >=18"
+        "node": ">=18"
       }
     },
     "node_modules/@csstools/media-query-list-parser": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz",
-      "integrity": "sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz",
+      "integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==",
       "dev": true,
       "funding": [
         {
@@ -1440,11 +1440,11 @@
         }
       ],
       "engines": {
-        "node": "^14 || ^16 || >=18"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^2.7.1",
-        "@csstools/css-tokenizer": "^2.4.1"
+        "@csstools/css-parser-algorithms": "^3.0.1",
+        "@csstools/css-tokenizer": "^3.0.1"
       }
     },
     "node_modules/@csstools/postcss-sass": {
@@ -1482,9 +1482,9 @@
       }
     },
     "node_modules/@csstools/selector-specificity": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
-      "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
+      "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
       "dev": true,
       "funding": [
         {
@@ -1497,10 +1497,10 @@
         }
       ],
       "engines": {
-        "node": "^14 || ^16 || >=18"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "postcss-selector-parser": "^6.0.13"
+        "postcss-selector-parser": "^6.1.0"
       }
     },
     "node_modules/@dual-bundle/import-meta-resolve": {
@@ -1537,9 +1537,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz",
-      "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
+      "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
       "dev": true,
       "dependencies": {
         "@eslint/object-schema": "^2.1.4",
@@ -1586,9 +1586,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz",
-      "integrity": "sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
+      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2248,17 +2248,17 @@
       }
     },
     "node_modules/@primer/primitives": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-8.2.4.tgz",
-      "integrity": "sha512-gOLLcqSpscOL8Or/RzUUiZdB7kCuOfeuIzMpJQwxvim6igK2sFROBXzdYoSHbH6lOmIabbpPd2lX5rfMWsUjKA==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-9.0.3.tgz",
+      "integrity": "sha512-iHl1oI566v3NMAkK2tmKsTkcNmen5mE3nCIdKmaSJZnxLTUT1NWwv77J7FfeRDAQl8VdU6qGfA2/D4sV9JjB/g==",
       "engines": {
         "node": ">=18.18.0 <18.19.0"
       }
     },
     "node_modules/@primer/stylelint-config": {
-      "version": "13.0.0-rc.fd47ce2",
-      "resolved": "https://registry.npmjs.org/@primer/stylelint-config/-/stylelint-config-13.0.0-rc.fd47ce2.tgz",
-      "integrity": "sha512-JqiJ2zFdFzc8djUzpmZB8s6MjAVbj/3IuzyEcyiaorSjDWw0CbXg6vsKJ/+aisCDDbWbTdTXr4ScVH3u8q0e0g==",
+      "version": "13.0.0-rc.fe9ab86",
+      "resolved": "https://registry.npmjs.org/@primer/stylelint-config/-/stylelint-config-13.0.0-rc.fe9ab86.tgz",
+      "integrity": "sha512-rXrRxhG7Fnk3PoevN7qwfylUQNFLLmayEHRLuphMtpDlhUuOkr5WHF5CnuN6Z7VE39J2aW4lgK5oWSaPRtbSLA==",
       "dev": true,
       "dependencies": {
         "@github/browserslist-config": "^1.0.0",
@@ -2282,10 +2282,16 @@
         "node": ">16.0.0"
       }
     },
+    "node_modules/@primer/stylelint-config/node_modules/@primer/primitives": {
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-8.2.3.tgz",
+      "integrity": "sha512-K8A/DA6xv8P/kD/9DupFn+KYlo06OpcrwfwJf+sKp+KnX7ZRwLLDg1AaEGAoRoaykXRY/gfrXlgDfK7laOTWyA==",
+      "dev": true
+    },
     "node_modules/@primer/view-components": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/@primer/view-components/-/view-components-0.30.0.tgz",
-      "integrity": "sha512-ns2Te5zWsPzPgT++GEDN9mXUigm2MiXeWS6ocfGvdMTWLx0/MSAB+bNKzNUpDrWxs8ZCl9mu1Ok+8Qu0p0ijsA==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@primer/view-components/-/view-components-0.32.0.tgz",
+      "integrity": "sha512-wiOu2FHXglJiYJAEildJUvpCjSk4IOJpGqluRqYhOA4Z1Orr2yehLZc14J7SvxrTK3WuanRyNSAiHs7k3693Eg==",
       "dependencies": {
         "@github/auto-check-element": "^5.2.0",
         "@github/auto-complete-element": "^3.6.2",
@@ -4492,16 +4498,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.8.0.tgz",
-      "integrity": "sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A==",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
+      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",
-        "@eslint/config-array": "^0.17.1",
+        "@eslint/config-array": "^0.18.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.8.0",
+        "@eslint/js": "9.9.1",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -4540,6 +4546,14 @@
       },
       "funding": {
         "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-config-prettier": {
@@ -4806,9 +4820,9 @@
       "license": "MIT"
     },
     "node_modules/eslint-plugin-jest": {
-      "version": "28.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.7.0.tgz",
-      "integrity": "sha512-fzPGN7awL2ftVRQh/bsCi+16ArUZWujZnD1b8EGJqy8nr4//7tZ3BIdc/9edcJBtB3hpci3GtdMNFVDwHU0Eag==",
+      "version": "28.8.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.2.tgz",
+      "integrity": "sha512-mC3OyklHmS5i7wYU1rGId9EnxRI8TVlnFG56AE+8U9iRy6zwaNygZR+DsdZuCL0gRG0wVeyzq+uWcPt6yJrrMA==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -5932,9 +5946,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -7493,9 +7507,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
         "braces": "^3.0.3",
@@ -8007,9 +8021,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "version": "8.4.43",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz",
+      "integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==",
       "dev": true,
       "funding": [
         {
@@ -8035,12 +8049,12 @@
       }
     },
     "node_modules/postcss-calc": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.0.1.tgz",
-      "integrity": "sha512-pp1Z3FxtxA+xHAoWXcOXgnBN1WPu4ZiJ5LWGjKyf9MMreagAsaTUtnqFK1y1sHhyJddAkYTPu6XSuLgb3oYCjw==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.0.2.tgz",
+      "integrity": "sha512-DT/Wwm6fCKgpYVI7ZEWuPJ4az8hiEHtCUeYjZXqU7Ou4QqYh1Df2yCQ7Ca6N7xqKPFkxN3fhf+u9KSoOCJNAjg==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.1.1",
+        "postcss-selector-parser": "^6.1.2",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -8172,9 +8186,9 @@
       }
     },
     "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.4.tgz",
-      "integrity": "sha512-R6vHqZWgVnTAPq0C+xjyHfEZqfIYboCBVSy24MjxEDm+tIh1BU4O6o7DP7AA7kHzf136d+Qc5duI4tlpHjixDw==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
+      "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==",
       "dev": true
     },
     "node_modules/postcss-safe-parser": {
@@ -8219,9 +8233,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-      "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -9696,9 +9710,9 @@
       }
     },
     "node_modules/stylelint": {
-      "version": "16.8.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.8.1.tgz",
-      "integrity": "sha512-O8aDyfdODSDNz/B3gW2HQ+8kv8pfhSu7ZR7xskQ93+vI6FhKKGUJMQ03Ydu+w3OvXXE0/u4hWU4hCPNOyld+OA==",
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.9.0.tgz",
+      "integrity": "sha512-31Nm3WjxGOBGpQqF43o3wO9L5AC36TPIe6030Lnm13H3vDMTcS21DrLh69bMX+DBilKqMMVLian4iG6ybBoNRQ==",
       "dev": true,
       "funding": [
         {
@@ -9711,10 +9725,10 @@
         }
       ],
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^2.7.1",
-        "@csstools/css-tokenizer": "^2.4.1",
-        "@csstools/media-query-list-parser": "^2.1.13",
-        "@csstools/selector-specificity": "^3.1.1",
+        "@csstools/css-parser-algorithms": "^3.0.1",
+        "@csstools/css-tokenizer": "^3.0.1",
+        "@csstools/media-query-list-parser": "^3.0.1",
+        "@csstools/selector-specificity": "^4.0.0",
         "@dual-bundle/import-meta-resolve": "^4.1.0",
         "balanced-match": "^2.0.0",
         "colord": "^2.9.3",
@@ -9729,24 +9743,24 @@
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.3.1",
-        "ignore": "^5.3.1",
+        "ignore": "^5.3.2",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
         "known-css-properties": "^0.34.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^13.2.0",
-        "micromatch": "^4.0.7",
+        "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "picocolors": "^1.0.1",
-        "postcss": "^8.4.40",
-        "postcss-resolve-nested-selector": "^0.1.4",
+        "postcss": "^8.4.41",
+        "postcss-resolve-nested-selector": "^0.1.6",
         "postcss-safe-parser": "^7.0.0",
-        "postcss-selector-parser": "^6.1.1",
+        "postcss-selector-parser": "^6.1.2",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "string-width": "^4.2.3",
         "strip-ansi": "^7.1.0",
-        "supports-hyperlinks": "^3.0.0",
+        "supports-hyperlinks": "^3.1.0",
         "svg-tags": "^1.0.0",
         "table": "^6.8.2",
         "write-file-atomic": "^5.0.1"
@@ -10016,9 +10030,9 @@
       }
     },
     "node_modules/supports-hyperlinks": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
-      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
+      "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
       "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0",
@@ -10026,6 +10040,9 @@
       },
       "engines": {
         "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
diff --git a/package.json b/package.json
index 18beae23..834fa287 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,8 @@
     "build:storybook": "cd docs && npm i && npm run build:storybook"
   },
   "dependencies": {
-    "@primer/primitives": "^8.2.0",
-    "@primer/view-components": "^0.30.0"
+    "@primer/primitives": "^9.0.3",
+    "@primer/view-components": "^0.32.0"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
diff --git a/src/autocomplete/suggester.scss b/src/autocomplete/suggester.scss
index 9e6d5c8a..8ce37b71 100644
--- a/src/autocomplete/suggester.scss
+++ b/src/autocomplete/suggester.scss
@@ -12,7 +12,9 @@
   list-style: none;
   cursor: pointer;
   background: var(--overlay-bgColor, var(--color-canvas-overlay));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
   box-shadow: var(--shadow-resting-medium, var(--color-shadow-medium));
 
@@ -20,6 +22,7 @@
     display: block;
     padding: var(--base-size-4) var(--base-size-8);
     font-weight: $font-weight-semibold;
+    // stylelint-disable-next-line primer/borders
     border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
     small {
@@ -29,12 +32,16 @@
 
     &:last-child {
       border-bottom: 0;
+      // stylelint-disable-next-line primer/borders
       border-bottom-right-radius: $border-radius;
+      // stylelint-disable-next-line primer/borders
       border-bottom-left-radius: $border-radius;
     }
 
     &:first-child {
+      // stylelint-disable-next-line primer/borders
       border-top-left-radius: $border-radius;
+      // stylelint-disable-next-line primer/borders
       border-top-right-radius: $border-radius;
     }
 
diff --git a/src/base/base.scss b/src/base/base.scss
index 7fde534c..404ada7e 100644
--- a/src/base/base.scss
+++ b/src/base/base.scss
@@ -61,6 +61,7 @@ hr,
   overflow: hidden;
   background: transparent;
   border: 0;
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   @include clearfix();
@@ -72,6 +73,7 @@ hr,
 
 table {
   border-spacing: 0;
+  // stylelint-disable-next-line primer/borders
   border-collapse: collapse;
 }
 
diff --git a/src/base/kbd.scss b/src/base/kbd.scss
index 0e435955..813668a5 100644
--- a/src/base/kbd.scss
+++ b/src/base/kbd.scss
@@ -13,6 +13,7 @@ kbd {
   // stylelint-disable-next-line primer/borders
   border: $border-style $border-width var(--borderColor-neutral-muted, var(--color-neutral-muted));
   border-bottom-color: var(--borderColor-neutral-muted, var(--color-neutral-muted));
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
   // stylelint-disable-next-line primer/box-shadow
   box-shadow: inset 0 -1px 0 var(--borderColor-neutral-muted, var(--color-neutral-muted));
diff --git a/src/box/box-overlay.scss b/src/box/box-overlay.scss
index 5fd710c8..dbf2356d 100644
--- a/src/box/box-overlay.scss
+++ b/src/box/box-overlay.scss
@@ -12,8 +12,11 @@
   .Box-header {
     margin: 0;
     border-width: 0;
+    // stylelint-disable-next-line primer/borders
     border-bottom-width: $border-width;
+    // stylelint-disable-next-line primer/borders
     border-top-left-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-top-right-radius: $border-radius;
   }
 }
diff --git a/src/branch-name/branch-name.scss b/src/branch-name/branch-name.scss
index c18c746e..6febe21b 100644
--- a/src/branch-name/branch-name.scss
+++ b/src/branch-name/branch-name.scss
@@ -10,6 +10,7 @@
   color: var(--fgColor-muted, var(--color-fg-muted));
   word-break: break-all;
   background-color: var(--bgColor-accent-muted, var(--color-accent-subtle));
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
 
   .octicon {
diff --git a/src/buttons/button-group.scss b/src/buttons/button-group.scss
index 1f0240f7..cb162735 100644
--- a/src/buttons/button-group.scss
+++ b/src/buttons/button-group.scss
@@ -23,13 +23,18 @@
   border-radius: 0;
 
   &:first-child {
+    // stylelint-disable-next-line primer/borders
     border-top-left-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-left-radius: $border-radius;
   }
 
   &:last-child {
+    // stylelint-disable-next-line primer/borders
     border-right-width: $border-width;
+    // stylelint-disable-next-line primer/borders
     border-top-right-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-right-radius: $border-radius;
   }
 
@@ -38,6 +43,7 @@
   &:focus,
   &:active,
   &:hover {
+    // stylelint-disable-next-line primer/borders
     border-right-width: $border-width;
 
     + .BtnGroup-item,
@@ -51,13 +57,18 @@
   float: left;
 
   &:first-child .BtnGroup-item {
+    // stylelint-disable-next-line primer/borders
     border-top-left-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-left-radius: $border-radius;
   }
 
   &:last-child .BtnGroup-item {
+    // stylelint-disable-next-line primer/borders
     border-right-width: $border-width;
+    // stylelint-disable-next-line primer/borders
     border-top-right-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-right-radius: $border-radius;
   }
 
@@ -72,6 +83,7 @@
   &:active,
   &:hover {
     .BtnGroup-item {
+      // stylelint-disable-next-line primer/borders
       border-right-width: $border-width;
     }
 
diff --git a/src/buttons/button.scss b/src/buttons/button.scss
index bf3995ad..9d490619 100644
--- a/src/buttons/button.scss
+++ b/src/buttons/button.scss
@@ -14,7 +14,9 @@
   vertical-align: middle;
   cursor: pointer;
   user-select: none;
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style;
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
   appearance: none; // Corrects inability to style clickable `input` types in iOS.
 
diff --git a/src/buttons/misc.scss b/src/buttons/misc.scss
index 904c457b..ce8b39bc 100644
--- a/src/buttons/misc.scss
+++ b/src/buttons/misc.scss
@@ -32,6 +32,7 @@
   &:not(.dropdown-item) {
     &:focus,
     &:focus-visible {
+      // stylelint-disable-next-line primer/borders
       border-radius: $border-radius;
       outline-offset: 0;
     }
@@ -45,6 +46,7 @@
   color: var(--fgColor-accent, var(--color-accent-fg));
   background-color: transparent; // Reset default gradient backgrounds and colors
   border: 0;
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
   box-shadow: none;
 
@@ -103,6 +105,7 @@
 
   &:focus,
   &:focus-visible {
+    // stylelint-disable-next-line primer/borders
     border-radius: $border-radius;
   }
 
@@ -214,9 +217,12 @@
   color: var(--fgColor-default, var(--color-fg-default));
   vertical-align: middle;
   background-color: var(--bgColor-default, var(--color-canvas-default));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--button-default-borderColor-rest, var(--color-btn-border));
   border-left: 0;
+  // stylelint-disable-next-line primer/borders
   border-top-right-radius: $border-radius;
+  // stylelint-disable-next-line primer/borders
   border-bottom-right-radius: $border-radius;
   box-shadow: var(--shadow-resting-small, var(--color-shadow-small)), var(--shadow-highlight, var(--color-primer-shadow-highlight));
 
diff --git a/src/forms/form-control.scss b/src/forms/form-control.scss
index 9b5ab8dd..49ddfb86 100644
--- a/src/forms/form-control.scss
+++ b/src/forms/form-control.scss
@@ -17,7 +17,9 @@
   background-color: var(--bgColor-default, var(--color-canvas-default));
   background-repeat: no-repeat; // Repeat and position set for form states (success, error, etc)
   background-position: right 8px center; // For form validation. This keeps images 8px from right and centered vertically.
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--control-borderColor-rest, var(--color-border-default));
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
   box-shadow: var(--shadow-inset, var(--color-primer-shadow-inset));
   transition: 80ms cubic-bezier(0.33, 1, 0.68, 1);
@@ -43,6 +45,7 @@
   &.border-0 {
     &:focus,
     &:focus-visible {
+      // stylelint-disable-next-line primer/borders
       border: $border-width $border-style var(--borderColor-accent-emphasis, var(--color-accent-fg)) !important;
     }
   }
@@ -143,6 +146,7 @@ textarea.form-control {
       padding: 2px var(--base-size-4);
       font-style: normal;
       background: var(--bgColor-attention-muted, var(--color-attention-subtle));
+      // stylelint-disable-next-line primer/borders
       border-radius: $border-radius;
     }
   }
@@ -254,7 +258,9 @@ input::-webkit-inner-spin-button {
   font-size: $h5-size;
   color: var(--fgColor-attention, var(--color-attention-fg));
   background: var(--bgColor-attention-muted, var(--color-attention-subtle));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--borderColor-attention-emphasis, var(--color-attention-emphasis));
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
 
   p {
diff --git a/src/forms/form-group.scss b/src/forms/form-group.scss
index 8814e6aa..63eddf30 100644
--- a/src/forms/form-group.scss
+++ b/src/forms/form-group.scss
@@ -176,8 +176,11 @@
       margin: var(--base-size-8) 0 0;
       font-size: $font-size-small;
       font-weight: $font-weight-normal;
+      // stylelint-disable-next-line primer/borders
       border-style: $border-style;
+      // stylelint-disable-next-line primer/borders
       border-width: $border-width;
+      // stylelint-disable-next-line primer/borders
       border-radius: $border-radius;
 
       &::after,
diff --git a/src/forms/radio-group.scss b/src/forms/radio-group.scss
index 8e7acae2..aa769803 100644
--- a/src/forms/radio-group.scss
+++ b/src/forms/radio-group.scss
@@ -15,6 +15,7 @@
   line-height: 20px; // Specifically not inherit our `<body>` default
   color: var(--fgColor-default, var(--color-fg-default));
   cursor: pointer;
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
 
   :checked + & {
@@ -25,12 +26,16 @@
 
   &:first-of-type {
     margin-left: 0;
+    // stylelint-disable-next-line primer/borders
     border-top-left-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-left-radius: $border-radius;
   }
 
   &:last-of-type {
+    // stylelint-disable-next-line primer/borders
     border-top-right-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-right-radius: $border-radius;
   }
 
diff --git a/src/header/header.scss b/src/header/header.scss
index d299090d..a7c69d88 100644
--- a/src/header/header.scss
+++ b/src/header/header.scss
@@ -37,6 +37,7 @@
 .Header-input {
   color: var(--header-fgColor-default, var(--color-header-text));
   background-color: var(--headerSearch-bgColor, var(--color-header-search-bg));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--headerSearch-borderColor, var(--color-header-search-border));
   box-shadow: none;
 
diff --git a/src/labels/mixins.scss b/src/labels/mixins.scss
index c002a127..b93abbc1 100644
--- a/src/labels/mixins.scss
+++ b/src/labels/mixins.scss
@@ -12,7 +12,9 @@
   font-weight: $font-weight-semibold;
   line-height: 18px;
   white-space: nowrap;
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style transparent;
+  // stylelint-disable-next-line primer/borders
   border-radius: 2em;
 }
 
diff --git a/src/layout/app-frame.scss b/src/layout/app-frame.scss
index 586c66ed..f282d372 100644
--- a/src/layout/app-frame.scss
+++ b/src/layout/app-frame.scss
@@ -1,6 +1,5 @@
 // stylelint-disable max-nesting-depth
 // stylelint-disable primer/spacing
-// stylelint-disable primer/borders
 
 .AppFrame {
 
diff --git a/src/layout/stack.scss b/src/layout/stack.scss
index 5fad157b..1371c997 100644
--- a/src/layout/stack.scss
+++ b/src/layout/stack.scss
@@ -161,14 +161,14 @@
 
   :not(.Stack--dir-inline#{$viewportRange}) > .Stack-divider,
   :not(.Stack--dir-inline#{$viewportRange}) > .Stack-item > .Stack-divider {
-    border-block-end: var(--borderWidth-thin, 1px) solid var(--Stack-divider-color);
+    border-block-end: var(--borderWidth-thin, var(--borderWidth-thin)) solid var(--Stack-divider-color);
     inline-size: auto;
     block-size: 0;
   }
 
   .Stack--dir-inline#{$viewportRange} > .Stack-divider,
   .Stack--dir-inline#{$viewportRange} > .Stack-item > .Stack-divider {
-    border-inline-end: var(--borderWidth-thin, 1px) solid var(--Stack-divider-color);
+    border-inline-end: var(--borderWidth-thin, var(--borderWidth-thin)) solid var(--Stack-divider-color);
     inline-size: 0;
     block-size: auto;
   }
diff --git a/src/markdown/code.scss b/src/markdown/code.scss
index b0e73956..6b15673b 100644
--- a/src/markdown/code.scss
+++ b/src/markdown/code.scss
@@ -10,6 +10,7 @@
     font-size: 85%;
     white-space: break-spaces; // keeps rendering spaces, but breaks them onto multiple lines
     background-color: var(--bgColor-neutral-muted, var(--color-neutral-muted));
+    // stylelint-disable-next-line primer/borders
     border-radius: $border-radius;
 
     br { display: none; }
@@ -60,6 +61,7 @@
     line-height: 1.45;
     color: var(--fgColor-default, var(--color-fg-default));
     background-color: var(--bgColor-muted, var(--color-canvas-subtle));
+    // stylelint-disable-next-line primer/borders
     border-radius: $border-radius;
   }
 
diff --git a/src/markdown/footnotes.scss b/src/markdown/footnotes.scss
index 7a48a0d6..92f0eb23 100644
--- a/src/markdown/footnotes.scss
+++ b/src/markdown/footnotes.scss
@@ -15,6 +15,7 @@
   .footnotes {
     font-size: $h6-size;
     color: var(--fgColor-muted, var(--color-fg-muted));
+    // stylelint-disable-next-line primer/borders
     border-top: $border;
 
     ol {
@@ -41,6 +42,7 @@
       content: '';
       // stylelint-disable-next-line primer/borders
       border: 2px $border-style var(--borderColor-accent-emphasis, var(--color-accent-emphasis));
+      // stylelint-disable-next-line primer/borders
       border-radius: $border-radius;
     }
 
diff --git a/src/markdown/headings.scss b/src/markdown/headings.scss
index e7a89684..a46f127d 100644
--- a/src/markdown/headings.scss
+++ b/src/markdown/headings.scss
@@ -41,6 +41,7 @@
     padding-bottom: 0.3em;
     // stylelint-disable-next-line primer/typography
     font-size: 2em;
+    // stylelint-disable-next-line primer/borders
     border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
   }
 
@@ -49,6 +50,7 @@
     padding-bottom: 0.3em;
     // stylelint-disable-next-line primer/typography
     font-size: 1.5em;
+    // stylelint-disable-next-line primer/borders
     border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
   }
 
diff --git a/src/markdown/images.scss b/src/markdown/images.scss
index f4be72b1..481afcea 100644
--- a/src/markdown/images.scss
+++ b/src/markdown/images.scss
@@ -44,6 +44,7 @@
       // stylelint-disable-next-line primer/spacing
       margin: 13px 0 0;
       overflow: hidden;
+      // stylelint-disable-next-line primer/borders
       border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
     }
 
diff --git a/src/markdown/tables.scss b/src/markdown/tables.scss
index 23d781a4..675c74fd 100644
--- a/src/markdown/tables.scss
+++ b/src/markdown/tables.scss
@@ -17,6 +17,7 @@
     td {
       // stylelint-disable-next-line primer/spacing
       padding: 6px 13px;
+      // stylelint-disable-next-line primer/borders
       border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
     }
 
@@ -28,6 +29,7 @@
 
     tr {
       background-color: var(--bgColor-default, var(--color-canvas-default));
+      // stylelint-disable-next-line primer/borders
       border-top: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
       &:nth-child(2n) {
diff --git a/src/navigation/filter-list.scss b/src/navigation/filter-list.scss
index 1d515a53..27c3286f 100644
--- a/src/navigation/filter-list.scss
+++ b/src/navigation/filter-list.scss
@@ -35,6 +35,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   cursor: pointer;
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
 
   &:hover {
diff --git a/src/navigation/sidenav.scss b/src/navigation/sidenav.scss
index a32afaa6..f469e226 100644
--- a/src/navigation/sidenav.scss
+++ b/src/navigation/sidenav.scss
@@ -16,6 +16,7 @@
   text-align: left;
   background-color: transparent;
   border: 0;
+  // stylelint-disable-next-line primer/borders
   border-top: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   &:first-child {
diff --git a/src/navigation/subnav.scss b/src/navigation/subnav.scss
index acfe1639..ef9fc1fe 100644
--- a/src/navigation/subnav.scss
+++ b/src/navigation/subnav.scss
@@ -12,6 +12,7 @@
 .subnav-bordered {
   // stylelint-disable-next-line primer/spacing
   padding-bottom: 20px;
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 }
 
@@ -28,6 +29,7 @@
   // stylelint-disable-next-line primer/typography
   line-height: 20px;
   color: var(--fgColor-default, var(--color-fg-default));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--control-borderColor-rest, var(--color-border-default));
 
   + .subnav-item {
@@ -67,12 +69,16 @@
   }
 
   &:first-child {
+    // stylelint-disable-next-line primer/borders
     border-top-left-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-left-radius: $border-radius;
   }
 
   &:last-child {
+    // stylelint-disable-next-line primer/borders
     border-top-right-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-bottom-right-radius: $border-radius;
   }
 }
diff --git a/src/pagination/pagination.scss b/src/pagination/pagination.scss
index d04c45bb..789aad82 100644
--- a/src/pagination/pagination.scss
+++ b/src/pagination/pagination.scss
@@ -16,7 +16,9 @@
     vertical-align: middle;
     cursor: pointer;
     user-select: none;
+    // stylelint-disable-next-line primer/borders
     border: $border-width $border-style transparent;
+    // stylelint-disable-next-line primer/borders
     border-radius: $border-radius;
     transition: border-color 0.2s cubic-bezier(0.3, 0, 0.5, 1);
 
diff --git a/src/select-menu/select-menu.scss b/src/select-menu/select-menu.scss
index 68c11260..1d11b050 100644
--- a/src/select-menu/select-menu.scss
+++ b/src/select-menu/select-menu.scss
@@ -62,6 +62,7 @@ $SelectMenu-max-height: 480px !default;
   pointer-events: auto;
   flex-direction: column;
   background-color: var(--overlay-bgColor, var(--color-canvas-overlay));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style var(--selectMenu-borderColor, var(--color-select-menu-backdrop-border));
   // stylelint-disable-next-line primer/borders
   border-radius: $border-radius * 2;
@@ -89,6 +90,7 @@ $SelectMenu-max-height: 480px !default;
     margin: var(--base-size-8) 0 var(--base-size-16) 0;
     font-size: $font-size-small;
     border-color: var(--borderColor-default, var(--color-border-default));
+    // stylelint-disable-next-line primer/borders
     border-radius: $border-radius;
     box-shadow: var(--shadow-floating-legacy, var(--color-overlay-shadow));
     animation-name: SelectMenu-modal-animation--sm;
@@ -104,6 +106,7 @@ $SelectMenu-max-height: 480px !default;
   padding: var(--base-size-16);
   flex: none; // fixes header from getting squeezed in Safari iOS
   align-items: center;
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   @include breakpoint(sm) {
@@ -144,6 +147,7 @@ $SelectMenu-max-height: 480px !default;
 .SelectMenu-filter {
   padding: var(--base-size-16);
   margin: 0;
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   @include breakpoint(sm) {
@@ -192,6 +196,7 @@ $SelectMenu-max-height: 480px !default;
   cursor: pointer;
   background-color: var(--overlay-bgColor, var(--color-canvas-overlay));
   border: 0;
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   @include breakpoint(sm) {
@@ -262,9 +267,12 @@ $SelectMenu-max-height: 480px !default;
   @include breakpoint(sm) {
     flex: none;
     padding: var(--base-size-4) var(--base-size-16);
+    // stylelint-disable-next-line primer/borders
     border: $border-width $border-style transparent;
     border-bottom-width: 0;
+    // stylelint-disable-next-line primer/borders
     border-top-left-radius: $border-radius;
+    // stylelint-disable-next-line primer/borders
     border-top-right-radius: $border-radius;
   }
 
@@ -292,6 +300,7 @@ $SelectMenu-max-height: 480px !default;
   padding: 7px var(--base-size-16);
   text-align: center;
   background-color: var(--overlay-bgColor, var(--color-canvas-overlay));
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 }
 
@@ -317,10 +326,12 @@ $SelectMenu-max-height: 480px !default;
   font-weight: $font-weight-semibold;
   color: var(--fgColor-muted, var(--color-fg-muted));
   background-color: var(--bgColor-muted, var(--color-canvas-subtle));
+  // stylelint-disable-next-line primer/borders
   border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   // Borderless
   .SelectMenu-list--borderless & {
+    // stylelint-disable-next-line primer/borders
     border-top: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
     &:empty {
@@ -340,6 +351,7 @@ $SelectMenu-max-height: 480px !default;
   font-size: $font-size-small;
   color: var(--fgColor-muted, var(--color-fg-muted));
   text-align: center;
+  // stylelint-disable-next-line primer/borders
   border-top: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
 
   @include breakpoint(sm) {
diff --git a/src/toasts/toasts.scss b/src/toasts/toasts.scss
index bbc30c99..a5799207 100644
--- a/src/toasts/toasts.scss
+++ b/src/toasts/toasts.scss
@@ -5,6 +5,7 @@
   margin: var(--base-size-8);
   color: var(--fgColor-default, var(--color-fg-default));
   background-color: var(--bgColor-default, var(--color-canvas-default));
+  // stylelint-disable-next-line primer/borders
   border-radius: $border-radius;
   box-shadow: inset 0 0 0 1px var(--borderColor-default, var(--color-border-default)), var(--shadow-floating-legacy, var(--color-overlay-shadow));
 
@@ -23,6 +24,7 @@
   flex-shrink: 0;
   color: var(--fgColor-onEmphasis, var(--color-fg-on-emphasis));
   background-color: var(--bgColor-accent-emphasis, var(--color-accent-emphasis));
+  // stylelint-disable-next-line primer/borders
   border: $border-width $border-style transparent;
   border-right: 0;
   border-top-left-radius: inherit;
diff --git a/src/tooltips/tooltips.scss b/src/tooltips/tooltips.scss
index 36f1c19e..086231a1 100644
--- a/src/tooltips/tooltips.scss
+++ b/src/tooltips/tooltips.scss
@@ -23,7 +23,6 @@
   pointer-events: none;
   content: attr(aria-label);
   background: var(--bgColor-emphasis, var(--color-neutral-emphasis-plus));
-  // stylelint-disable-next-line primer/borders
   border-radius: var(--borderRadius-medium);
   opacity: 0;
 }
@@ -195,6 +194,7 @@
     max-width: var(--overlay-width-small, 20rem);
     word-wrap: break-word;
     white-space: pre-line;
+    // stylelint-disable-next-line primer/borders
     border-collapse: separate;
   }