diff --git a/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx b/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx
index 79b92b0882..989664e0d2 100644
--- a/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx
+++ b/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx
@@ -25,7 +25,7 @@ const options = Object.keys(borderRadiusOptions).map((optionKey) => ({
       key={optionKey}
       openOnTargetFocus={false}
     >
-      <button>
+      <button tabIndex={-1}>
         <div
           className="w-5 h-5 border-t-2 border-l-2 border-gray-500"
           style={{ borderTopLeftRadius: borderRadiusOptions[optionKey] }}
diff --git a/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx b/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx
index 5dca90dd91..562a426869 100644
--- a/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx
+++ b/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx
@@ -20,7 +20,7 @@ const options = Object.keys(boxShadowOptions).map((optionKey) => ({
       key={optionKey}
       openOnTargetFocus={false}
     >
-      <button>
+      <button tabIndex={-1}>
         <div
           className="flex items-center justify-center w-5 h-5 bg-white"
           style={{ boxShadow: boxShadowOptions[optionKey] }}