diff --git a/plugins/woocommerce-blocks/assets/js/blocks/customer-account/editor.scss b/plugins/woocommerce-blocks/assets/js/blocks/customer-account/editor.scss
index 92974fb7555..29d5256e9bc 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/customer-account/editor.scss
+++ b/plugins/woocommerce-blocks/assets/js/blocks/customer-account/editor.scss
@@ -6,7 +6,3 @@
 .block-editor-block-card + div > .wc-block-editor-customer-account__link {
 	padding: 0 $gap $gap 52px;
 }
-/* In tabbed sidebar (ie: WP >=6.2) */
-.wc-block-editor-customer-account__link {
-	padding: $gap;
-}
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/customer-account/sidebar-settings.tsx b/plugins/woocommerce-blocks/assets/js/blocks/customer-account/sidebar-settings.tsx
index d58e8d28408..9af6529c282 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/customer-account/sidebar-settings.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/customer-account/sidebar-settings.tsx
@@ -66,7 +66,9 @@ export const BlockSettings = ( {
 
 	return (
 		<InspectorControls key="inspector">
-			<AccountSettingsLink />
+			<PanelBody>
+				<AccountSettingsLink />
+			</PanelBody>
 			<PanelBody
 				title={ __(
 					'Display settings',