diff --git a/packages/calcite-components/src/components/block-section/block-section.e2e.ts b/packages/calcite-components/src/components/block-section/block-section.e2e.ts
index 3ec0ad96f16..5f533869ec4 100644
--- a/packages/calcite-components/src/components/block-section/block-section.e2e.ts
+++ b/packages/calcite-components/src/components/block-section/block-section.e2e.ts
@@ -1,4 +1,4 @@
-import { CSS, TEXT } from "./resources";
+import { CSS } from "./resources";
 import { accessible, defaults, focusable, hidden, reflects, renders, t9n } from "../../tests/commonTests";
 import { E2EPage, newE2EPage } from "@stencil/core/testing";
 import { html } from "../../../support/formatting";
@@ -87,9 +87,8 @@ describe("calcite-block-section", () => {
     });
 
     it("can be toggled", async () => {
-      const page = await newE2EPage({
-        html: `<calcite-block-section toggle-display="switch"></calcite-block-section>`,
-      });
+      const page = await newE2EPage();
+      await page.setContent(html`<calcite-block-section text="text" toggle-display="switch"></calcite-block-section>`);
       await assertToggleBehavior(page);
     });
 
@@ -119,7 +118,8 @@ describe("calcite-block-section", () => {
     });
 
     it("can be toggled", async () => {
-      const page = await newE2EPage({ html: "<calcite-block-section></calcite-block-section>" });
+      const page = await newE2EPage();
+      await page.setContent(html`<calcite-block-section text="text"></calcite-block-section>`);
       await assertToggleBehavior(page);
     });
   });
@@ -173,19 +173,19 @@ describe("calcite-block-section", () => {
     const toggleSpy = await element.spyOnEvent("calciteBlockSectionToggle");
     const toggle = await page.find(`calcite-block-section >>> .${CSS.toggle}`);
 
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.expand);
+    expect(toggle.getAttribute("aria-expanded")).toBe("false");
 
     await toggle.click();
 
     expect(toggleSpy).toHaveReceivedEventTimes(1);
     expect(await element.getProperty("open")).toBe(true);
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.collapse);
+    expect(toggle.getAttribute("aria-expanded")).toBe("true");
 
     await toggle.click();
 
     expect(toggleSpy).toHaveReceivedEventTimes(2);
     expect(await element.getProperty("open")).toBe(false);
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.expand);
+    expect(toggle.getAttribute("aria-expanded")).toBe("false");
 
     const keyboardToggleEmitter =
       toggle.tagName === "CALCITE-ACTION"
@@ -206,13 +206,13 @@ describe("calcite-block-section", () => {
 
     expect(toggleSpy).toHaveReceivedEventTimes(3);
     expect(await element.getProperty("open")).toBe(true);
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.collapse);
+    expect(toggle.getAttribute("aria-expanded")).toBe("true");
 
     await keyboardToggleEmitter.press("Enter");
     await page.waitForChanges();
 
     expect(toggleSpy).toHaveReceivedEventTimes(4);
     expect(await element.getProperty("open")).toBe(false);
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.expand);
+    expect(toggle.getAttribute("aria-expanded")).toBe("false");
   }
 });
diff --git a/packages/calcite-components/src/components/block-section/block-section.scss b/packages/calcite-components/src/components/block-section/block-section.scss
index 051fde69d8c..3d90065ae6d 100644
--- a/packages/calcite-components/src/components/block-section/block-section.scss
+++ b/packages/calcite-components/src/components/block-section/block-section.scss
@@ -60,11 +60,18 @@
   word-wrap: anywhere;
 }
 
-.toggle--switch {
-  calcite-switch {
-    @apply pointer-events-none;
+.toggle--switch-container {
+  @apply flex items-center relative bg-transparent w-full;
+
+  .focus-guard {
+    --calcite-label-margin-bottom: 0;
+    @apply absolute pointer-events-none;
+    inset-inline-end: 0;
     margin-inline-start: theme("margin.1");
   }
+}
+
+.toggle--switch {
   .status-icon {
     margin-inline-start: theme("margin.2");
   }
diff --git a/packages/calcite-components/src/components/block-section/block-section.tsx b/packages/calcite-components/src/components/block-section/block-section.tsx
index a84b1bd2a11..ac76d37b85b 100644
--- a/packages/calcite-components/src/components/block-section/block-section.tsx
+++ b/packages/calcite-components/src/components/block-section/block-section.tsx
@@ -13,7 +13,6 @@ import {
 } from "@stencil/core";
 
 import { focusFirstTabbable, getElementDir, toAriaBoolean } from "../../utils/dom";
-import { guid } from "../../utils/guid";
 import { isActivationKey } from "../../utils/key";
 import { connectLocalized, disconnectLocalized, LocalizedComponent } from "../../utils/locale";
 import {
@@ -26,7 +25,7 @@ import {
 import { Status } from "../interfaces";
 import { BlockSectionMessages } from "./assets/block-section/t9n";
 import { BlockSectionToggleDisplay } from "./interfaces";
-import { CSS, ICONS } from "./resources";
+import { CSS, ICONS, IDS } from "./resources";
 import {
   componentFocusable,
   LoadableComponent,
@@ -117,8 +116,6 @@ export class BlockSection implements LocalizedComponent, T9nComponent, LoadableC
 
   @Element() el: HTMLCalciteBlockSectionElement;
 
-  private guid = guid();
-
   @State() effectiveLocale: string;
 
   @Watch("effectiveLocale")
@@ -213,41 +210,46 @@ export class BlockSection implements LocalizedComponent, T9nComponent, LoadableC
 
     const toggleLabel = open ? messages.collapse : messages.expand;
 
-    const { guid } = this;
-    const regionId = `${guid}-region`;
-    const buttonId = `${guid}-button`;
-
     const headerNode =
       toggleDisplay === "switch" ? (
         <div
-          aria-controls={regionId}
-          aria-label={toggleLabel}
           class={{
-            [CSS.toggle]: true,
-            [CSS.toggleSwitch]: true,
+            [CSS.toggleSwitchContainer]: true,
           }}
-          id={buttonId}
-          onClick={this.toggleSection}
-          onKeyDown={this.handleHeaderKeyDown}
-          tabIndex={0}
-          title={toggleLabel}
         >
-          <div class={CSS.toggleSwitchContent}>
-            <span class={CSS.toggleSwitchText}>{text}</span>
+          <div
+            aria-controls={IDS.content}
+            aria-expanded={toAriaBoolean(open)}
+            class={{
+              [CSS.toggle]: true,
+              [CSS.toggleSwitch]: true,
+            }}
+            id={IDS.toggle}
+            onClick={this.toggleSection}
+            onKeyDown={this.handleHeaderKeyDown}
+            role="button"
+            tabIndex={0}
+            title={toggleLabel}
+          >
+            <div class={CSS.toggleSwitchContent}>
+              <span class={CSS.toggleSwitchText}>{text}</span>
+            </div>
+            {this.renderStatusIcon()}
           </div>
-          <calcite-switch checked={open} label={toggleLabel} scale="s" tabIndex={-1} />
-          {this.renderStatusIcon()}
+          {/* we use calcite-label to use a simple component that will allow us to prevent keyboard focus by setting tabindex="-1" on the host */}
+          <calcite-label class={CSS.focusGuard} layout="inline" tabIndex={-1}>
+            <calcite-switch checked={open} label={toggleLabel} scale="s" />
+          </calcite-label>
         </div>
       ) : (
         <button
-          aria-controls={regionId}
-          aria-label={toggleLabel}
+          aria-controls={IDS.content}
+          aria-expanded={toAriaBoolean(open)}
           class={{
             [CSS.sectionHeader]: true,
             [CSS.toggle]: true,
           }}
-          id={buttonId}
-          name={toggleLabel}
+          id={IDS.toggle}
           onClick={this.toggleSection}
         >
           <calcite-icon icon={arrowIcon} scale="s" />
@@ -259,13 +261,7 @@ export class BlockSection implements LocalizedComponent, T9nComponent, LoadableC
     return (
       <Host>
         {headerNode}
-        <section
-          aria-expanded={toAriaBoolean(open)}
-          aria-labelledby={buttonId}
-          class={CSS.content}
-          hidden={!open}
-          id={regionId}
-        >
+        <section aria-labelledby={IDS.toggle} class={CSS.content} hidden={!open} id={IDS.content}>
           <slot />
         </section>
       </Host>
diff --git a/packages/calcite-components/src/components/block-section/resources.ts b/packages/calcite-components/src/components/block-section/resources.ts
index efb15fb0ee7..a33e0955350 100644
--- a/packages/calcite-components/src/components/block-section/resources.ts
+++ b/packages/calcite-components/src/components/block-section/resources.ts
@@ -1,21 +1,23 @@
+export const IDS = {
+  content: "content",
+  toggle: "toggle",
+};
+
 export const CSS = {
   content: "content",
+  focusGuard: "focus-guard",
   invalid: "invalid",
+  sectionHeader: "section-header",
+  sectionHeaderText: "section-header__text",
+  statusIcon: "status-icon",
   toggle: "toggle",
   toggleSwitch: "toggle--switch",
+  toggleSwitchContainer: "toggle--switch-container",
   toggleSwitchContent: "toggle--switch__content",
   toggleSwitchText: "toggle--switch__text",
-  sectionHeader: "section-header",
-  sectionHeaderText: "section-header__text",
-  statusIcon: "status-icon",
   valid: "valid",
 };
 
-export const TEXT = {
-  collapse: "Collapse",
-  expand: "Expand",
-};
-
 export const ICONS = {
   menuOpen: "chevron-down",
   menuClosedLeft: "chevron-left",
diff --git a/packages/calcite-components/src/components/block/block.e2e.ts b/packages/calcite-components/src/components/block/block.e2e.ts
index 6b63dcdd361..edd43157332 100644
--- a/packages/calcite-components/src/components/block/block.e2e.ts
+++ b/packages/calcite-components/src/components/block/block.e2e.ts
@@ -1,5 +1,5 @@
 import { newE2EPage } from "@stencil/core/testing";
-import { CSS, SLOTS, TEXT } from "./resources";
+import { CSS, SLOTS } from "./resources";
 import { accessible, defaults, disabled, focusable, hidden, renders, slots, t9n } from "../../tests/commonTests";
 import { html } from "../../../support/formatting";
 
@@ -136,31 +136,31 @@ describe("calcite-block", () => {
   });
 
   it("allows toggling its content", async () => {
-    const page = await newE2EPage({ html: "<calcite-block collapsible></calcite-block>" });
+    const heading = "heading";
+    const page = await newE2EPage();
+    await page.setContent(html`<calcite-block collapsible heading=${heading}></calcite-block>`);
+    const messages = await import(`./assets/block/t9n/messages.json`);
 
     const element = await page.find("calcite-block");
     const toggleSpy = await element.spyOnEvent("calciteBlockToggle");
     const toggle = await page.find(`calcite-block >>> .${CSS.toggle}`);
 
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.expand);
     expect(toggle.getAttribute("aria-expanded")).toBe("false");
-    expect(toggle.getAttribute("title")).toBe(TEXT.expand);
+    expect(toggle.getAttribute("title")).toBe(messages.expand);
 
     await toggle.click();
 
     expect(toggleSpy).toHaveReceivedEventTimes(1);
     expect(await element.getProperty("open")).toBe(true);
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.collapse);
     expect(toggle.getAttribute("aria-expanded")).toBe("true");
-    expect(toggle.getAttribute("title")).toBe(TEXT.collapse);
+    expect(toggle.getAttribute("title")).toBe(messages.collapse);
 
     await toggle.click();
 
     expect(toggleSpy).toHaveReceivedEventTimes(2);
     expect(await element.getProperty("open")).toBe(false);
-    expect(toggle.getAttribute("aria-label")).toBe(TEXT.expand);
     expect(toggle.getAttribute("aria-expanded")).toBe("false");
-    expect(toggle.getAttribute("title")).toBe(TEXT.expand);
+    expect(toggle.getAttribute("title")).toBe(messages.expand);
   });
 
   describe("header", () => {
diff --git a/packages/calcite-components/src/components/block/block.tsx b/packages/calcite-components/src/components/block/block.tsx
index 51f0046d690..e2a0c9ee64e 100644
--- a/packages/calcite-components/src/components/block/block.tsx
+++ b/packages/calcite-components/src/components/block/block.tsx
@@ -17,7 +17,6 @@ import {
   disconnectConditionalSlotComponent,
 } from "../../utils/conditionalSlot";
 import { focusFirstTabbable, getSlotted, toAriaBoolean } from "../../utils/dom";
-import { guid } from "../../utils/guid";
 import {
   connectInteractive,
   disconnectInteractive,
@@ -35,7 +34,7 @@ import {
 import { Heading, HeadingLevel } from "../functional/Heading";
 import { Status } from "../interfaces";
 import { BlockMessages } from "./assets/block/t9n";
-import { CSS, ICONS, SLOTS } from "./resources";
+import { CSS, ICONS, IDS, SLOTS } from "./resources";
 import {
   componentFocusable,
   LoadableComponent,
@@ -157,8 +156,6 @@ export class Block
 
   @Element() el: HTMLCalciteBlockElement;
 
-  private guid = guid();
-
   @State() effectiveLocale: string;
 
   @Watch("effectiveLocale")
@@ -292,20 +289,15 @@ export class Block
     const hasMenuActions = !!getSlotted(el, SLOTS.headerMenuActions);
     const collapseIcon = open ? ICONS.opened : ICONS.closed;
 
-    const { guid } = this;
-    const regionId = `${guid}-region`;
-    const buttonId = `${guid}-button`;
-
     const headerNode = (
       <div class={CSS.headerContainer}>
         {this.dragHandle ? <calcite-handle /> : null}
         {collapsible ? (
           <button
-            aria-controls={regionId}
+            aria-controls={IDS.content}
             aria-expanded={collapsible ? toAriaBoolean(open) : null}
-            aria-label={toggleLabel}
             class={CSS.toggle}
-            id={buttonId}
+            id={IDS.toggle}
             onClick={this.onHeaderClick}
             title={toggleLabel}
           >
@@ -344,13 +336,7 @@ export class Block
           }}
         >
           {headerNode}
-          <section
-            aria-expanded={toAriaBoolean(open)}
-            aria-labelledby={buttonId}
-            class={CSS.content}
-            hidden={!open}
-            id={regionId}
-          >
+          <section aria-labelledby={IDS.toggle} class={CSS.content} hidden={!open} id={IDS.content}>
             {this.renderScrim()}
           </section>
         </article>
diff --git a/packages/calcite-components/src/components/block/resources.ts b/packages/calcite-components/src/components/block/resources.ts
index f7a7eec39c5..5055552f0ef 100644
--- a/packages/calcite-components/src/components/block/resources.ts
+++ b/packages/calcite-components/src/components/block/resources.ts
@@ -1,27 +1,25 @@
+export const IDS = {
+  content: "content",
+  toggle: "toggle",
+};
+
 export const CSS = {
+  button: "button",
   container: "container",
   content: "content",
+  controlContainer: "control-container",
+  description: "description",
+  header: "header",
   headerContainer: "header-container",
+  heading: "heading",
   icon: "icon",
+  invalid: "invalid",
   statusIcon: "status-icon",
+  summary: "summary",
+  title: "title",
   toggle: "toggle",
   toggleIcon: "toggle-icon",
-  title: "title",
-  heading: "heading",
-  header: "header",
-  button: "button",
-  summary: "summary",
-  description: "description",
-  controlContainer: "control-container",
   valid: "valid",
-  invalid: "invalid",
-};
-
-export const TEXT = {
-  collapse: "Collapse",
-  expand: "Expand",
-  loading: "Loading",
-  options: "Options",
 };
 
 export const SLOTS = {