diff --git a/packages/terra-aggregator/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png b/packages/terra-aggregator/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png
index 7a575742e40..c5ad102e4f7 100644
Binary files a/packages/terra-aggregator/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png and b/packages/terra-aggregator/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png differ
diff --git a/packages/terra-aggregator/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png b/packages/terra-aggregator/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png
index 1f1f3656096..a20374d2f91 100644
Binary files a/packages/terra-aggregator/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png and b/packages/terra-aggregator/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png differ
diff --git a/packages/terra-aggregator/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png b/packages/terra-aggregator/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png
index a2cc7bba7fd..af3de836d9e 100644
Binary files a/packages/terra-aggregator/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png and b/packages/terra-aggregator/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_large/aggregator-spec/close_from_explicit_close.png differ
diff --git a/packages/terra-framework-docs/CHANGELOG.md b/packages/terra-framework-docs/CHANGELOG.md
index 39be7a91a18..871a72d36a3 100644
--- a/packages/terra-framework-docs/CHANGELOG.md
+++ b/packages/terra-framework-docs/CHANGELOG.md
@@ -5,6 +5,9 @@
 * Changed
   * Updated `terra-navigation-side-menu` example.
 
+* Added
+  * Added test example for `terra-slide-panel` with no `mainContent` prop.
+
 ## 1.75.0 - (March 19, 2024)
 
 * Changed
@@ -13,7 +16,7 @@
 ## 1.74.0 - (March 14, 2024)
 
 * Added
-  * Added an example of a `compact-interactive-list` with no borders.
+  * Added an example for `terra-compact-interactive-list` with no borders.
 
 * Changed
   * Updated `terra-compact-interactive-list` documentation for `terra-menu` support.
diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderList.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderList.jsx
index 915cf7ddbbe..d8dae3a81c1 100644
--- a/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderList.jsx
+++ b/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderList.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import './PlaceholderList.module.scss';
 /* eslint-disable */
 const List = ({ children, isPadded }) => (
-  <ul aria-label="Placeholder List" role="listbox" className={isPadded ? 'placeholder-list is-padded' : 'placeholder-list '}>
+  <ul aria-label="Placeholder List" role="tablist" className={isPadded ? 'placeholder-list is-padded' : 'placeholder-list '}>
     {children}
   </ul>
 );
diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderListItem.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderListItem.jsx
index e22aab74a19..9cf00af7f19 100644
--- a/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderListItem.jsx
+++ b/packages/terra-framework-docs/src/terra-dev-site/doc/aggregator/common/placeholder-list/PlaceholderListItem.jsx
@@ -24,7 +24,7 @@ const PlaceholderListItem = ({
       className={classNames}
       onClick={onSelect}
       onKeyDown={keyDown}
-      role="option"
+      role="tab"
     >
       {children}
     </li>
diff --git a/packages/terra-framework-docs/src/terra-dev-site/test/slide-panel/SlidePanelNoMainContent.test.jsx b/packages/terra-framework-docs/src/terra-dev-site/test/slide-panel/SlidePanelNoMainContent.test.jsx
new file mode 100644
index 00000000000..a7cb53b40d5
--- /dev/null
+++ b/packages/terra-framework-docs/src/terra-dev-site/test/slide-panel/SlidePanelNoMainContent.test.jsx
@@ -0,0 +1,102 @@
+import React, { useState } from 'react';
+import SlidePanel, { SlidePanelPositions } from 'terra-slide-panel';
+import classNames from 'classnames/bind';
+import styles from './SlidePanelNoMainContent.test.module.scss';
+
+const cx = classNames.bind(styles);
+
+const mainContentForSlidePanel = (togglePanelHandler) => (
+  <div>
+    <header className={cx('header-content')}>
+      <h3>Main Content</h3>
+      <button id="mainToggleBtn" type="button" onClick={togglePanelHandler} className={cx('custom-button')}>Toggle Panel 1</button>
+      {/* eslint-disable-next-line jsx-a11y/no-interactive-element-to-noninteractive-role */}
+      <button id="mainToggleBtnWithWrongRole" type="button" role="presentation" onClick={togglePanelHandler} className={cx('extension-button')}>Toggle Panel 2</button>
+      { /* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions */}
+      <p id="mainToggleParagraph" onClick={togglePanelHandler} className={cx('extension-button')}>Toggle Panel 3</p>
+    </header>
+    <div className={cx('content-wrapper')}>
+      <p>
+        This is the main content area of the slide panel.
+        The overall height of the SlidePanel is determined by
+        the intrinsic height of the content in this container.
+      </p>
+      <p>
+        {'Focus is moved to the toggle button in the panel container when the panel is opened via the componentDidUpdate lifecycle hook in '}
+        <a href="https://github.com/cerner/terra-framework/blob/main/packages/terra-slide-panel/src/terra-dev-site/doc/example/DefaultSlidePanel.jsx">the example code</a>
+        .
+      </p>
+      <ul>
+        <li>Item 1</li>
+        <li>Item 2</li>
+        <li>Item 3</li>
+        <li>Item 4</li>
+        <li>Item 5</li>
+        <li>Item 6</li>
+        <li>Item 7</li>
+        <li>Item 8</li>
+      </ul>
+    </div>
+  </div>
+);
+
+const panelContentForSlidePanel = (togglePanelHandler) => (
+  <div>
+    <header className={cx('header-content')}>
+      <h3 className={cx('heading')}>Panel Content</h3>
+      <button id="panelToggleBtn" type="button" onClick={togglePanelHandler} className={cx('extension-button')}>Toggle Panel</button>
+    </header>
+    <div className={cx('content-wrapper')}>
+      <p>This is the panel content area of the slide panel.</p>
+      <p>
+        {'Focus is moved to the toggle button in the main container when the panel is closed via the componentDidUpdate lifecycle hook in '}
+        <a href="https://github.com/cerner/terra-framework/blob/main/packages/terra-slide-panel/src/terra-dev-site/doc/example/DefaultSlidePanel.jsx">the example code</a>
+        .
+      </p>
+      <ul>
+        <li>Item 1</li>
+        <li>Item 2</li>
+        <li>Item 3</li>
+        <li>Item 4</li>
+        <li>Item 5</li>
+        <li>Item 6</li>
+        <li>Item 7</li>
+        <li>Item 8</li>
+        <li>Item 9</li>
+        <li>Item 10</li>
+        <li>Item 11</li>
+        <li>Item 12</li>
+        <li>Item 13</li>
+        <li>Item 14</li>
+        <li>Item 15</li>
+      </ul>
+    </div>
+  </div>
+);
+
+const SlidePanelNoMainContent = () => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const handlePanelToggle = () => {
+    setIsOpen(!isOpen);
+  };
+
+  return (
+    <div className={cx('example-container')}>
+      {mainContentForSlidePanel(handlePanelToggle)}
+      <div className={isOpen ? cx('panel-container') : null}>
+        <SlidePanel
+          id="test-slide"
+          panelContent={panelContentForSlidePanel(handlePanelToggle)}
+          panelAriaLabel="Panel content area"
+          panelSize="small"
+          panelBehavior="overlay"
+          panelPosition={SlidePanelPositions.END}
+          isOpen={isOpen}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default SlidePanelNoMainContent;
diff --git a/packages/terra-framework-docs/src/terra-dev-site/test/slide-panel/SlidePanelNoMainContent.test.module.scss b/packages/terra-framework-docs/src/terra-dev-site/test/slide-panel/SlidePanelNoMainContent.test.module.scss
new file mode 100644
index 00000000000..01d0ec03265
--- /dev/null
+++ b/packages/terra-framework-docs/src/terra-dev-site/test/slide-panel/SlidePanelNoMainContent.test.module.scss
@@ -0,0 +1,41 @@
+:local {
+    .example-container { 
+      position: relative;
+    }
+
+    .panel-container > div:first-child {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      right: 0;
+      left: 0;
+    }
+
+    .header-content {
+      background-color: #d3d3d3;
+
+      p {
+        width: auto;
+        display: inline-block;
+        margin: 0 !important;
+      }
+    }
+
+    .header-content > :not(:last-child){
+      margin-right: 5px;
+    }
+  
+    .header-content h3 {
+      display: inline-block;
+      margin: 0;
+      padding: 5px;
+    }
+  
+    .content-wrapper {
+      margin: 5px;
+    }
+    
+    .custom-button {
+      display: inline-block;
+    }
+  }
diff --git a/packages/terra-slide-panel-manager/tests/jest/__snapshots__/SlidePanelManager.test.jsx.snap b/packages/terra-slide-panel-manager/tests/jest/__snapshots__/SlidePanelManager.test.jsx.snap
index 1756569f80e..f4e221e7099 100644
--- a/packages/terra-slide-panel-manager/tests/jest/__snapshots__/SlidePanelManager.test.jsx.snap
+++ b/packages/terra-slide-panel-manager/tests/jest/__snapshots__/SlidePanelManager.test.jsx.snap
@@ -364,8 +364,6 @@ exports[`SlidePanelManager should disclose content in SlidePanel 1`] = `
               aria-hidden="false"
               className="main"
               key="main"
-              onClick={[Function]}
-              onKeyUp={[Function]}
               role="main"
               tabIndex="-1"
             >
@@ -863,8 +861,6 @@ exports[`SlidePanelManager should render a SlidePanelManager with level three he
               aria-hidden="false"
               className="main"
               key="main"
-              onClick={[Function]}
-              onKeyUp={[Function]}
               role="main"
               tabIndex="-1"
             >
@@ -1130,8 +1126,6 @@ exports[`SlidePanelManager should render the SlidePanelManager with custom props
               aria-hidden="false"
               className="main"
               key="main"
-              onClick={[Function]}
-              onKeyUp={[Function]}
               role="main"
               tabIndex="-1"
             >
@@ -1390,8 +1384,6 @@ exports[`SlidePanelManager should render the SlidePanelManager with defaults 1`]
               aria-hidden="false"
               className="main"
               key="main"
-              onClick={[Function]}
-              onKeyUp={[Function]}
               role="main"
               tabIndex="-1"
             >
@@ -1650,8 +1642,6 @@ exports[`SlidePanelManager should render the SlidePanelManager with squish overr
               aria-hidden="false"
               className="main"
               key="main"
-              onClick={[Function]}
-              onKeyUp={[Function]}
               role="main"
               tabIndex="-1"
             >
diff --git a/packages/terra-slide-panel/CHANGELOG.md b/packages/terra-slide-panel/CHANGELOG.md
index 42daa35020f..586ba336776 100644
--- a/packages/terra-slide-panel/CHANGELOG.md
+++ b/packages/terra-slide-panel/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Changed
+  * Updated capturing the disclosing node to accommodate for cases with no `mainContent`.
+
 ## 3.47.0 - (December 18, 2023)
 
 * Changed
diff --git a/packages/terra-slide-panel/src/SlidePanel.jsx b/packages/terra-slide-panel/src/SlidePanel.jsx
index da9f252309b..b66c765456f 100644
--- a/packages/terra-slide-panel/src/SlidePanel.jsx
+++ b/packages/terra-slide-panel/src/SlidePanel.jsx
@@ -90,7 +90,6 @@ class SlidePanel extends React.Component {
     super(props);
     this.setPanelNode = this.setPanelNode.bind(this);
     this.mainNode = React.createRef();
-    this.setLastClicked = this.setLastClicked.bind(this);
     this.setDisclosingNode = this.setDisclosingNode.bind(this);
     this.mainAriaDescribedByID = `detail-panel-warning-${uuidv4()}`;
   }
@@ -98,7 +97,7 @@ class SlidePanel extends React.Component {
   componentDidUpdate(prevProps) {
     if (this.props.isOpen && this.props.isOpen !== prevProps.isOpen) {
       // Save the disclosing node for returning focus when panel is closed
-      this.setDisclosingNode(this.lastClicked);
+      this.setDisclosingNode(document.activeElement);
       this.panelNode.focus();
       return;
     }
@@ -110,8 +109,12 @@ class SlidePanel extends React.Component {
         this.disclosingNode.focus();
         return;
       }
-      // The disclosing element doesn't exist or isn't focusable, return focus to the main div
-      this.mainNode.current.focus();
+      // The disclosing element doesn't exist or isn't focusable, return focus to the main div or body
+      if (this.mainNode?.current) {
+        this.mainNode.current.focus();
+      } else {
+        document.body.focus();
+      }
     }
   }
 
@@ -122,10 +125,6 @@ class SlidePanel extends React.Component {
     this.panelNode = node;
   }
 
-  setLastClicked(event) {
-    this.lastClicked = event.target;
-  }
-
   setDisclosingNode(node) {
     if (node) {
       node.setAttribute('aria-expanded', 'true');
@@ -189,8 +188,6 @@ class SlidePanel extends React.Component {
         aria-hidden={isOpen && isFullscreen ? 'true' : 'false'}
         ref={this.mainNode}
         role="main"
-        onClick={this.setLastClicked}
-        onKeyUp={this.setLastClicked}
       >
         <VisuallyHiddenText
           tabIndex="-1"
@@ -204,11 +201,11 @@ class SlidePanel extends React.Component {
     const content = (panelPosition === SlidePanelPositions.START) ? (
       <React.Fragment>
         {panelDiv}
-        {mainDiv}
+        {mainContent && mainDiv}
       </React.Fragment>
     ) : (
       <React.Fragment>
-        {mainDiv}
+        {mainContent && mainDiv}
         {panelDiv}
       </React.Fragment>
     );
diff --git a/packages/terra-slide-panel/tests/jest/SlidePanel.test.jsx b/packages/terra-slide-panel/tests/jest/SlidePanel.test.jsx
index a7afab860b1..e55dc7502d0 100644
--- a/packages/terra-slide-panel/tests/jest/SlidePanel.test.jsx
+++ b/packages/terra-slide-panel/tests/jest/SlidePanel.test.jsx
@@ -107,6 +107,15 @@ describe('When a SlidePanel is rendered', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
+  it('should render a SlidePanel without main content if mainContent prop was not provided', () => {
+    const slidePanel = (
+      <SlidePanel />
+    );
+    const wrapper = enzymeIntl.shallowWithIntl(slidePanel).dive();
+    const mainContent = wrapper.find('.main');
+    expect(mainContent.length).toBe(0);
+  });
+
   it('should render a SlidePanel with panel content', () => {
     const slidePanel = (
       <SlidePanel
@@ -138,7 +147,7 @@ describe('When a SlidePanel is rendered', () => {
   });
 
   it('should render a SlidePanel with panelAriaLabel and mainAriaLabel specified', () => {
-    const slidePanel = <SlidePanel panelAriaLabel="Panel content area" mainAriaLabel="Main content area" />;
+    const slidePanel = <SlidePanel panelAriaLabel="Panel content area" mainContent={<p>Main Content</p>} mainAriaLabel="Main content area" />;
     const wrapper = enzymeIntl.shallowWithIntl(slidePanel).dive();
 
     const panelDiv = wrapper.find('.panel');
@@ -163,7 +172,7 @@ describe('When a SlidePanel is rendered', () => {
   });
 
   it('should contain a Visually Hidden Text as the aria-describedby target', () => {
-    const slidePanel = <SlidePanel />;
+    const slidePanel = <SlidePanel mainContent={<p>Main Content</p>} />;
     const wrapper = enzymeIntl.shallowWithIntl(slidePanel).dive();
 
     const mainDiv = wrapper.find('#detail-panel-warning-00000000-0000-0000-0000-000000000000').prop('text');
@@ -171,7 +180,7 @@ describe('When a SlidePanel is rendered', () => {
   });
 
   it('should set the text property of Visually Hidden Text from ./translations', () => {
-    const slidePanel = <IntlProvider locale="en" messages={translationsFile}><SlidePanel /></IntlProvider>;
+    const slidePanel = <IntlProvider locale="en" messages={translationsFile}><SlidePanel mainContent={<p>Main Content</p>} /></IntlProvider>;
     const wrapper = enzymeIntl.shallowWithIntl(slidePanel).dive().dive();
 
     const mainDiv = wrapper.find('#detail-panel-warning-00000000-0000-0000-0000-000000000000').prop('text');
@@ -202,7 +211,7 @@ describe('When custom props are used', () => {
   });
 
   it('sets aria-hidden to true on main content div when isOpen and isFullscreen props are both true', () => {
-    const slidePanel = <SlidePanel isOpen isFullscreen />;
+    const slidePanel = <SlidePanel mainContent={<p>Main Content</p>} isOpen isFullscreen />;
     const wrapper = enzymeIntl.shallowWithIntl(slidePanel).dive();
 
     const mainDiv = wrapper.find('.main');
diff --git a/packages/terra-slide-panel/tests/jest/__snapshots__/SlidePanel.test.jsx.snap b/packages/terra-slide-panel/tests/jest/__snapshots__/SlidePanel.test.jsx.snap
index b154ac05859..b37666cb50b 100644
--- a/packages/terra-slide-panel/tests/jest/__snapshots__/SlidePanel.test.jsx.snap
+++ b/packages/terra-slide-panel/tests/jest/__snapshots__/SlidePanel.test.jsx.snap
@@ -7,22 +7,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with a fullscr
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -45,22 +29,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with an open s
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="false"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -83,22 +51,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with fill 1`]
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -126,8 +78,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with main cont
     aria-hidden="false"
     className="main"
     key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
     role="main"
     tabIndex="-1"
   >
@@ -167,8 +117,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with main cont
     aria-hidden="false"
     className="main"
     key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
     role="main"
     tabIndex="-1"
   >
@@ -206,22 +154,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panel con
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -253,8 +185,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelAria
     aria-label="Main content area"
     className="main"
     key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
     role="main"
     tabIndex="-1"
   >
@@ -263,6 +193,9 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelAria
       tabIndex="-1"
       text="Terra.slidePanel.discloseWarning"
     />
+    <p>
+      Main Content
+    </p>
   </div>
   <div
     aria-hidden="true"
@@ -286,22 +219,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelBeha
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -324,22 +241,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelBeha
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -362,22 +263,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelPosi
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -412,22 +297,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelPosi
       text="Terra.slidePanel.defaultPanelLabel"
     />
   </div>
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
 </div>
 `;
 
@@ -438,22 +307,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelSize
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="large"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -476,22 +329,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with panelSize
   data-slide-panel-panel-position="end"
   data-slide-panel-panel-size="small"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -516,22 +353,6 @@ exports[`When a SlidePanel is rendered should render a SlidePanel with the given
   data-test-attr="ahoy thar"
   id="my-slide-panel"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -656,30 +477,6 @@ exports[`When custom props are used correctly applies the theme context classNam
         data-slide-panel-panel-position="end"
         data-slide-panel-panel-size="small"
       >
-        <div
-          aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-          aria-hidden="false"
-          className="main"
-          key="main"
-          onClick={[Function]}
-          onKeyUp={[Function]}
-          role="main"
-          tabIndex="-1"
-        >
-          <VisuallyHiddenText
-            id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-            tabIndex="-1"
-            text="Terra.slidePanel.discloseWarning"
-          >
-            <span
-              className="visually-hidden-text"
-              id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-              tabIndex="-1"
-            >
-              Terra.slidePanel.discloseWarning
-            </span>
-          </VisuallyHiddenText>
-        </div>
         <div
           aria-hidden="true"
           aria-label="Terra.slidePanel.defaultPanelLabel"
@@ -716,8 +513,6 @@ exports[`When custom props are used sets aria-hidden to true on main content div
     aria-hidden="true"
     className="main"
     key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
     role="main"
     tabIndex="-1"
   >
@@ -726,6 +521,9 @@ exports[`When custom props are used sets aria-hidden to true on main content div
       tabIndex="-1"
       text="Terra.slidePanel.discloseWarning"
     />
+    <p>
+      Main Content
+    </p>
   </div>
   <div
     aria-hidden="false"
@@ -750,22 +548,6 @@ exports[`When custom props are used should override user provided attributes tha
   data-slide-panel-panel-size="small"
   data-test-attr="ahoy thar"
 >
-  <div
-    aria-describedby="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-    aria-hidden="false"
-    className="main"
-    key="main"
-    onClick={[Function]}
-    onKeyUp={[Function]}
-    role="main"
-    tabIndex="-1"
-  >
-    <VisuallyHiddenText
-      id="detail-panel-warning-00000000-0000-0000-0000-000000000000"
-      tabIndex="-1"
-      text="Terra.slidePanel.discloseWarning"
-    />
-  </div>
   <div
     aria-hidden="true"
     aria-label="Terra.slidePanel.defaultPanelLabel"
diff --git a/packages/terra-slide-panel/tests/wdio/slide-panel-spec.js b/packages/terra-slide-panel/tests/wdio/slide-panel-spec.js
index 115e5d5769b..77228ba8e37 100644
--- a/packages/terra-slide-panel/tests/wdio/slide-panel-spec.js
+++ b/packages/terra-slide-panel/tests/wdio/slide-panel-spec.js
@@ -65,10 +65,15 @@ Terra.describeViewports('Slide panel', ['large'], () => {
   describe('Toggle the slide panel click', () => {
     it('Opens panel and focuses on panel', () => {
       browser.url('/raw/tests/cerner-terra-framework-docs/slide-panel/slide-panel-toggle');
-      $('#test-toggle').click();
+      const disclosingButton = $('#test-toggle');
+      // the disclosing button should not have aria-expanded property yet
+      expect(disclosingButton.getAttribute('aria-expanded')).toBeFalsy();
+      disclosingButton.click();
       $('#test-slide [aria-label="Panel content area"][aria-hidden="false"]').waitForExist();
       browser.pause(150);
       expect($('[aria-label="Panel content area"]').isFocused()).toBeTruthy();
+      // the disclosing button should have aria-expanded property set to true
+      expect(disclosingButton.getAttribute('aria-expanded')).toBe('true');
 
       // On Tab Press focuses on the button inside the panel
       browser.keys(['Tab']);
@@ -80,17 +85,25 @@ Terra.describeViewports('Slide panel', ['large'], () => {
       browser.url('/raw/tests/cerner-terra-framework-docs/slide-panel/slide-panel-toggle');
 
       browser.keys(['Tab']);
-      expect($('#test-toggle').isFocused()).toBeTruthy();
+      const disclosingButton = $('#test-toggle');
+      // the disclosing button should not have aria-expanded property yet
+      expect(disclosingButton.getAttribute('aria-expanded')).toBeFalsy();
+      expect(disclosingButton.isFocused()).toBeTruthy();
       browser.keys(['Enter']);
       $('#test-slide [aria-label="Panel content area"][aria-hidden="false"]').waitForExist();
       browser.pause(150);
 
       browser.keys(['Tab']);
       expect($('#focus-button').isFocused()).toBeTruthy();
+      // the disclosing button should have aria-expanded property set to true
+      expect(disclosingButton.getAttribute('aria-expanded')).toBe('true');
+
       browser.keys(['Enter']);
       $('#test-slide [aria-label="Panel content area"][aria-hidden="true"]').waitForExist();
 
       expect($('#test-toggle').isFocused()).toBeTruthy();
+      // the disclosing button should have aria-expanded property set to false
+      expect(disclosingButton.getAttribute('aria-expanded')).toBe('false');
 
       browser.pause(150);
 
@@ -199,28 +212,73 @@ Terra.describeViewports('Slide panel', ['large'], () => {
   describe('Non-focusable element used to disclose slide panel', () => {
     it('does not focus SVG when it is the disclosing node', () => {
       browser.url('/raw/tests/cerner-terra-framework-docs/slide-panel/slide-panel-svg-toggle');
-      $('#test-click-svg').moveTo();
-      $('#test-click-svg').click();
+      const disclosingElement = $('#test-click-svg');
+      // the disclosing non-focusable element should not have aria-expanded property set
+      expect(disclosingElement.getAttribute('aria-expanded')).toBeFalsy();
+      $(disclosingElement).moveTo();
+      $(disclosingElement).click();
       $('#test-slide [aria-label="Panel content area"][aria-hidden="false"]').waitForExist();
       browser.keys(['Tab']);
       expect($('#focus-button').isFocused()).toBeTruthy();
+      // the disclosing non-focusable element should not have aria-expanded property set
+      expect(disclosingElement.getAttribute('aria-expanded')).toBeFalsy();
       browser.keys(['Enter']);
 
-      expect($('body').isFocused()).toBeTruthy();
-      expect($('#test-click-svg').isFocused()).toBeFalsy();
+      expect($('[aria-label="Main content area"]').isFocused()).toBeTruthy();
+      expect($(disclosingElement).isFocused()).toBeFalsy();
     });
 
     it('focuses main node when disclosing node has undefined focus', () => {
       browser.url('/raw/tests/cerner-terra-framework-docs/slide-panel/slide-panel-svg-toggle');
-      $('#test-p-click').moveTo();
-      $('#test-p-click').click();
+      const disclosingElement = $('#test-p-click');
+      // the disclosing non-focusable element should not have aria-expanded property set
+      expect(disclosingElement.getAttribute('aria-expanded')).toBeFalsy();
+      disclosingElement.moveTo();
+      disclosingElement.click();
       $('#test-slide [aria-label="Panel content area"][aria-hidden="false"]').waitForExist();
       browser.keys(['Tab']);
       expect($('#focus-button').isFocused()).toBeTruthy();
+      // the disclosing non-focusable element should not have aria-expanded property set
+      expect(disclosingElement.getAttribute('aria-expanded')).toBeFalsy();
       browser.keys(['Enter']);
 
       expect($('[aria-label="Main content area"]').isFocused()).toBeTruthy();
       expect($('#test-click-svg').isFocused()).toBeFalsy();
     });
   });
+
+  describe('Slide panel with no mainContent prop passed', () => {
+    it('sets focus and aria-expanded props correctly if disclosing node is a regular button', () => {
+      browser.url('/raw/tests/cerner-terra-framework-docs/slide-panel/slide-panel-no-main-content');
+      const disclosureButton = $('#mainToggleBtn');
+      // the disclosing button should not have aria-expanded property set
+      expect(disclosureButton.getAttribute('aria-expanded')).toBeFalsy();
+      $(disclosureButton).moveTo();
+      $(disclosureButton).click();
+      $('[aria-label="Panel content area"][aria-hidden="false"]').waitForExist();
+      browser.keys(['Tab']);
+      expect($('#panelToggleBtn').isFocused()).toBeTruthy();
+      // the disclosing button should have aria-expanded property set
+      expect(disclosureButton.getAttribute('aria-expanded')).toBe('true');
+      browser.keys(['Enter']);
+      expect(disclosureButton.isFocused()).toBeTruthy();
+      expect(disclosureButton.getAttribute('aria-expanded')).toBe('false');
+    });
+
+    it('sets focus and aria-expanded props correctly if disclosing node is not focusable', () => {
+      browser.url('/raw/tests/cerner-terra-framework-docs/slide-panel/slide-panel-no-main-content');
+      const disclosureElement = $('#mainToggleParagraph');
+      // the disclosing button should not have aria-expanded property set
+      expect(disclosureElement.getAttribute('aria-expanded')).toBeFalsy();
+      $(disclosureElement).moveTo();
+      $(disclosureElement).click();
+      $('[aria-label="Panel content area"][aria-hidden="false"]').waitForExist();
+      browser.keys(['Tab']);
+      expect($('#panelToggleBtn').isFocused()).toBeTruthy();
+      // the disclosing button should not have aria-expanded property set
+      expect(disclosureElement.getAttribute('aria-expanded')).toBeFalsy();
+      browser.keys(['Enter']);
+      expect(disclosureElement.isFocused()).toBeFalsy();
+    });
+  });
 });