diff --git a/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.css b/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.css
index 4a46015d1c..122fff13ba 100644
--- a/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.css
+++ b/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.css
@@ -9,6 +9,16 @@ label[class*='spectrum-'] {
   margin-bottom: 0;
 }
 
+/*
+* This workaround can be removed when this fix is pulled in
+* https://github.com/adobe/react-spectrum/issues/7571
+*/
+[class*='spectrum-Menu-itemGrid'] svg,
+svg[class*='spectrum-Textfield-validationIcon'] {
+  /* set as border-box by reboot, but spectrum expects this to be content-box */
+  box-sizing: content-box;
+}
+
 svg[class*='spectrum-Textfield-validationIcon'] {
   /* set as border-box by reboot, but spectrum expects this to be content-box */
   box-sizing: content-box;