diff --git a/packages/ui-components/src/styles/index.css b/packages/ui-components/src/styles/index.css
index a5d636800e1ef..c1fe1ddb15026 100644
--- a/packages/ui-components/src/styles/index.css
+++ b/packages/ui-components/src/styles/index.css
@@ -13,19 +13,12 @@
 @import './base.css' layer(utilities);
 @import './markdown.css' layer(utilities);
 
-/*
-  The default border color has changed to `currentColor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
 @layer base {
   :root {
     --header-height: calc(var(--spacing, 0.25rem) * 16);
   }
 
+  /* See https://tailwindcss.com/docs/upgrade-guide#default-border-color */
   *,
   ::after,
   ::before,
@@ -33,6 +26,14 @@
   ::file-selector-button {
     border-color: var(--color-gray-200, currentColor);
   }
+
+  /* See https://tailwindcss.com/docs/upgrade-guide#buttons-use-the-default-cursor */
+  button,
+  [role='button'] {
+    &:not(:disabled) {
+      @apply cursor-pointer;
+    }
+  }
 }
 
 @custom-variant aria-current (&[aria-current="page"]);