diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index ca6f8f302f2308ffbef214f965fc1a591687b338..78dc419d1c8e94a619c3382059ccbe88c41c6471 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -185,6 +185,19 @@ tr .form-item,
   color: #82828c;
 }
 
+/* Add some spacing so that the focus ring and suffix don't overlap. */
+
+@media screen and (min-width: 601px) {
+  .form-item__suffix {
+    margin-left: 0.5rem; /* LTR */
+  }
+
+  [dir="rtl"] .form-item__suffix {
+    margin-right: 0.5rem;
+    margin-left: 0;
+  }
+}
+
 /**
  * Form actions.
  */
diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
index a39ea94255968e74423aaafee6f8445925b939c3..554df9c9d1100efaf736a69a7d8c0117253ea467 100644
--- a/core/themes/claro/css/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -114,6 +114,18 @@ tr .form-item,
   color: var(--input--disabled-fg-color);
 }
 
+/* Add some spacing so that the focus ring and suffix don't overlap. */
+@media screen and (min-width: 601px) {
+  .form-item__suffix {
+    margin-left: var(--space-xs); /* LTR */
+  }
+
+  [dir="rtl"] .form-item__suffix {
+    margin-right: var(--space-xs);
+    margin-left: 0;
+  }
+}
+
 /**
  * Form actions.
  */