diff --git a/blocks/donation-form-grid/edit/inspector.js b/blocks/donation-form-grid/edit/inspector.js
index 0381ef0993..9e4bea7896 100644
--- a/blocks/donation-form-grid/edit/inspector.js
+++ b/blocks/donation-form-grid/edit/inspector.js
@@ -213,7 +213,7 @@ const Inspector = ({attributes, setAttributes}) => {
                 </PanelBody>
             </Panel>
             <Panel>
-                <PanelBody title= {__('Grid Settings', 'give')} initialOpen={ true }>
+                <PanelBody className="give-donation-form-grid--grid-settings" title= {__('Grid Settings', 'give')} initialOpen={ true }>
                     <SelectControl
                         className="give-form-grid-inspector"
                         label={__('Order By', 'give')}
diff --git a/blocks/donation-form-grid/edit/style.scss b/blocks/donation-form-grid/edit/style.scss
index f95f3439a3..c476a91553 100644
--- a/blocks/donation-form-grid/edit/style.scss
+++ b/blocks/donation-form-grid/edit/style.scss
@@ -1,4 +1,4 @@
-.give-form-grid-inspector{
+.give-form-grid-inspector {
     flex-direction: row !important;
     align-items: center !important;
     justify-content: space-between !important;
@@ -14,8 +14,6 @@
         margin: -15px  0 15px 0 !important;
     }
 
-
-
     .components-base-control__label {
         margin: 0 !important;
     }
@@ -36,7 +34,7 @@
         align-items: center !important;
         justify-content: center !important;
 
-        .components-input-control__label{
+        .components-input-control__label {
             flex: 1 !important;
             margin: 0 !important;
         }
@@ -45,13 +43,14 @@
     .components-input-control__container {
         max-width: 135px !important;
 
-            > select {
-                line-height: 1.2 !important;
-            }
+        > select {
+            line-height: 1.2 !important;
         }
     }
+}
 
-    .components-form-token-field{
+.give-donation-form-grid--grid-settings {
+    .components-form-token-field {
         label { display: none !important;}
     }
 
@@ -59,4 +58,5 @@
         margin-top: 20px !important;
         border: 1px solid transparent;
     }
+}
 
diff --git a/blocks/donor-wall/edit/inspector.js b/blocks/donor-wall/edit/inspector.js
index 8d99ecb761..7567647afb 100644
--- a/blocks/donor-wall/edit/inspector.js
+++ b/blocks/donor-wall/edit/inspector.js
@@ -225,7 +225,7 @@ const { donorsPerPage,
                     </PanelBody>
                 </Panel>
                 <Panel>
-                    <PanelBody title= {__('Wall Settings', 'give')} initialOpen={ false }>
+                    <PanelBody className="give-wall--wall-settings" title= {__('Wall Settings', 'give')} initialOpen={ false }>
                         <SelectControl
                             className="give-donor-wall-inspector"
                             label={ __( 'Sort By', 'give' ) }
diff --git a/blocks/donor-wall/edit/style.scss b/blocks/donor-wall/edit/style.scss
index 304e89463e..7626689274 100644
--- a/blocks/donor-wall/edit/style.scss
+++ b/blocks/donor-wall/edit/style.scss
@@ -1,4 +1,4 @@
-.give-donor-wall-inspector{
+.give-donor-wall-inspector {
     flex-direction: row !important;
     align-items: center !important;
     justify-content: space-between !important;
@@ -32,13 +32,15 @@
     .components-input-control__container {
         max-width: 165px !important;
 
-            > select {
-                line-height: 1.2 !important;
-            }
+        > select {
+            line-height: 1.2 !important;
         }
     }
+}
 
-.components-form-token-field {
-    margin-top: -18px !important;
-    label { display: none !important;}
+.give-wall--wall-settings {
+    .components-form-token-field {
+        margin-top: -18px !important;
+        label { display: none !important;}
+    }
 }