diff --git a/.storybook/helpers/common.ts b/.storybook/helpers/common.ts
index 74eb15f466..498e1013c8 100644
--- a/.storybook/helpers/common.ts
+++ b/.storybook/helpers/common.ts
@@ -12,7 +12,7 @@ import { StoryContext } from '@storybook/angular';
 
 export const CommonModules = [CommonModule, BrowserAnimationsModule, FormsModule, ReactiveFormsModule];
 
-export function removeFocusOutline({ canvasElement }: StoryContext) {
+export function removeFocusOutline({ canvasElement }: Pick<StoryContext, 'canvasElement'>) {
   // remove keyboard focus outline from focused element (e.g. modal title)
   canvasElement.querySelector<HTMLElement>(':focus')?.blur();
 }
diff --git a/.storybook/stories/datagrid/datagrid-detail.stories.ts b/.storybook/stories/datagrid/datagrid-detail.stories.ts
index aa5dbf78ea..a69eaccfb6 100644
--- a/.storybook/stories/datagrid/datagrid-detail.stories.ts
+++ b/.storybook/stories/datagrid/datagrid-detail.stories.ts
@@ -6,27 +6,66 @@
  */
 
 import { ClrConditionalModule, ClrDatagridDetail, ClrDatagridModule } from '@clr/angular';
-import { Parameters } from '@storybook/addons';
-import { Story } from '@storybook/angular';
+import { moduleMetadata, StoryContext, StoryFn, StoryObj } from '@storybook/angular';
 
+import { removeFocusOutline } from '../../helpers/common';
 import { Element, elements } from '../../helpers/elements.data';
-import { setupStorybook } from '../../helpers/setup-storybook.helpers';
 
+export default {
+  title: 'Datagrid/Detail',
+  component: ClrDatagridDetail,
+  decorators: [
+    moduleMetadata({
+      imports: [ClrDatagridModule, ClrConditionalModule],
+    }),
+  ],
+  argTypes: {
+    // methods
+    close: { control: { disable: true } },
+    // story helpers
+    elements: { control: { disable: true }, table: { disable: true } },
+    detailContentType: { control: 'inline-radio', options: ['json', 'datagrid'] },
+    clrDetailAriaLabel: {
+      description: 'Title of the modal',
+    },
+    clrDetailAriaLabelledBy: {
+      description: "Id or multiple space separated Id's referencing existing text on the page",
+    },
+  },
+  args: {
+    //inputs
+    clrDetailAriaLabel: '',
+    clrDetailAriaLabelledBy: '',
+    // story helpers
+    elements,
+    detailContentType: 'json',
+    showLongContent: false,
+    highlight: true,
+    singleSelectable: false,
+    multiSelectable: false,
+    expandable: false,
+    compact: false,
+    hidableColumns: false,
+    height: 0,
+  },
+};
 const longContentElement: Element = {
   name: 'A really really really really really really really really really long content in the cell',
   symbol: 'Ac',
   number: 89,
   electronegativity: 1.1,
 };
-
-const defaultStory: Story = args => {
+const DetailTemplate: StoryFn = args => {
   args.elements = args.showLongContent ? [longContentElement, ...args.elements] : args.elements;
-
   return {
     template: `
       <style>
-        .highlight { border: 1px solid red !important; }
-        .electronegativity-container { border-bottom: 4px solid #119cd4; }
+        .highlight {
+          border: 1px solid red !important;
+        }
+        .electronegativity-container {
+          border-bottom: 4px solid #119cd4;
+        }
       </style>
       <clr-datagrid
         ${args.height ? '[style.height.px]="height"' : ''}
@@ -46,59 +85,54 @@ const defaultStory: Story = args => {
         <clr-dg-column>
           <ng-container ${args.hidableColumns ? '*clrDgHideableColumn' : ''}>Electronegativity</ng-container>
         </clr-dg-column>
-
         <clr-dg-row *clrDgItems="let element of elements; let index = index" [clrDgItem]="element">
-          <clr-dg-cell>{{element.name}}</clr-dg-cell>
-          <clr-dg-cell>{{element.symbol}}</clr-dg-cell>
-          <clr-dg-cell>{{element.number}}</clr-dg-cell>
+          <clr-dg-cell>{{ element.name }}</clr-dg-cell>
+          <clr-dg-cell>{{ element.symbol }}</clr-dg-cell>
+          <clr-dg-cell>{{ element.number }}</clr-dg-cell>
           <clr-dg-cell>
-            <div [style.width.%]="element.electronegativity * 100 / 4" class="electronegativity-container">
-              {{element.electronegativity}}
+            <div [style.width.%]="(element.electronegativity * 100) / 4" class="electronegativity-container">
+              {{ element.electronegativity }}
             </div>
           </clr-dg-cell>
           <ng-container *ngIf="expandable" ngProjectAs="clr-dg-row-detail">
-            <clr-dg-row-detail *clrIfExpanded>{{element|json}}</clr-dg-row-detail>
+            <clr-dg-row-detail *clrIfExpanded>{{ element | json }}</clr-dg-row-detail>
           </ng-container>
         </clr-dg-row>
-
-        <clr-dg-detail [ngClass]="{ highlight }" *clrIfDetail="let element">
-          <clr-dg-detail-header>{{element.name}}</clr-dg-detail-header>
+        <clr-dg-detail
+          [ngClass]="{ highlight }"
+          *clrIfDetail="let element"
+          ${args.clrDetailAriaLabel ? '[clrDetailAriaLabel]="clrDetailAriaLabel"' : ''}
+          ${args.clrDetailAriaLabelledBy ? '[clrDetailAriaLabelledBy]="clrDetailAriaLabelledBy"' : ''}
+        >
+          <clr-dg-detail-header>{{ element.name }}</clr-dg-detail-header>
           <clr-dg-detail-body [ngSwitch]="detailContentType">
-            <ng-container *ngSwitchCase="'json'">
-              {{element | json}}
-            </ng-container>
-          
+            <ng-container *ngSwitchCase="'json'">{{ element | json }}</ng-container>
             <clr-datagrid *ngSwitchCase="'datagrid'">
               <clr-dg-column>Key</clr-dg-column>
               <clr-dg-column>Value</clr-dg-column>
-
               <clr-dg-row>
                 <clr-dg-cell>Name</clr-dg-cell>
-                <clr-dg-cell>{{element.name}}</clr-dg-cell>
+                <clr-dg-cell>{{ element.name }}</clr-dg-cell>
               </clr-dg-row>
-
               <clr-dg-row>
                 <clr-dg-cell>Symbol</clr-dg-cell>
-                <clr-dg-cell>{{element.symbol}}</clr-dg-cell>
+                <clr-dg-cell>{{ element.symbol }}</clr-dg-cell>
               </clr-dg-row>
-
               <clr-dg-row>
                 <clr-dg-cell>Number</clr-dg-cell>
-                <clr-dg-cell>{{element.number}}</clr-dg-cell>
+                <clr-dg-cell>{{ element.number }}</clr-dg-cell>
               </clr-dg-row>
-
               <clr-dg-row>
                 <clr-dg-cell>Electronegativity</clr-dg-cell>
-                <clr-dg-cell>{{element.electronegativity}}</clr-dg-cell>
+                <clr-dg-cell>{{ element.electronegativity }}</clr-dg-cell>
               </clr-dg-row>
             </clr-datagrid>
           </clr-dg-detail-body>
         </clr-dg-detail>
-        
         <clr-dg-footer>
           <clr-dg-pagination #pagination>
-            <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Elements per page</clr-dg-page-size>
-            {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} of {{pagination.totalItems}} elements
+            <clr-dg-page-size [clrPageSizeOptions]="[10, 20, 50, 100]">Elements per page</clr-dg-page-size>
+            {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ pagination.totalItems }} elements
           </clr-dg-pagination>
         </clr-dg-footer>
       </clr-datagrid>
@@ -106,32 +140,20 @@ const defaultStory: Story = args => {
     props: { ...args },
   };
 };
+export const Detail: StoryObj = {
+  render: DetailTemplate,
+};
 
-const defaultParameters: Parameters = {
-  title: 'Datagrid/Detail',
-  component: ClrDatagridDetail,
-  argTypes: {
-    // methods
-    close: { control: { disable: true } },
-    // story helpers
-    elements: { control: { disable: true }, table: { disable: true } },
-    detailContentType: { control: { type: 'inline-radio', options: ['json', 'datagrid'] } },
+export const OpenDetail: StoryObj = {
+  render: DetailTemplate,
+  play({ canvasElement }: StoryContext) {
+    canvasElement.querySelector<HTMLButtonElement>('button.datagrid-detail-caret-button').click();
+
+    removeFocusOutline({ canvasElement });
   },
   args: {
-    // story helpers
-    elements,
-    detailContentType: 'json',
-    showLongContent: false,
-    highlight: true,
-    singleSelectable: false,
-    multiSelectable: false,
-    expandable: false,
-    compact: false,
-    hidableColumns: false,
-    height: 0,
+    detailContentType: 'datagrid',
+    // The height is set larger than the height of the rows to regression test the detail pane border. (CDE-2188)
+    height: 500,
   },
 };
-
-const variants: Parameters[] = [];
-
-setupStorybook([ClrDatagridModule, ClrConditionalModule], defaultStory, defaultParameters, variants);
diff --git a/projects/angular/src/data/datagrid/_datagrid.clarity.scss b/projects/angular/src/data/datagrid/_datagrid.clarity.scss
index b53cd2ece0..8b3429d552 100644
--- a/projects/angular/src/data/datagrid/_datagrid.clarity.scss
+++ b/projects/angular/src/data/datagrid/_datagrid.clarity.scss
@@ -553,6 +553,12 @@
     flex: 1 1 auto;
     align-content: flex-start;
 
+    .datagrid-rows {
+      display: flex;
+      flex-direction: column;
+      flex: 1 1 auto;
+    }
+
     .datagrid-body {
       width: auto;
     }
diff --git a/tests/snapshots/chromium/datagrid/detail--variants-core-dark.png b/tests/snapshots/chromium/datagrid/detail--detail-core-dark.png
similarity index 100%
rename from tests/snapshots/chromium/datagrid/detail--variants-core-dark.png
rename to tests/snapshots/chromium/datagrid/detail--detail-core-dark.png
diff --git a/tests/snapshots/chromium/datagrid/detail--variants-core-light.png b/tests/snapshots/chromium/datagrid/detail--detail-core-light.png
similarity index 100%
rename from tests/snapshots/chromium/datagrid/detail--variants-core-light.png
rename to tests/snapshots/chromium/datagrid/detail--detail-core-light.png
diff --git a/tests/snapshots/chromium/datagrid/detail--variants-ng-dark.png b/tests/snapshots/chromium/datagrid/detail--detail-ng-dark.png
similarity index 100%
rename from tests/snapshots/chromium/datagrid/detail--variants-ng-dark.png
rename to tests/snapshots/chromium/datagrid/detail--detail-ng-dark.png
diff --git a/tests/snapshots/chromium/datagrid/detail--variants-ng-light.png b/tests/snapshots/chromium/datagrid/detail--detail-ng-light.png
similarity index 100%
rename from tests/snapshots/chromium/datagrid/detail--variants-ng-light.png
rename to tests/snapshots/chromium/datagrid/detail--detail-ng-light.png
diff --git a/tests/snapshots/chromium/datagrid/detail--open-detail-core-dark.png b/tests/snapshots/chromium/datagrid/detail--open-detail-core-dark.png
new file mode 100644
index 0000000000..93e0fd4fc4
Binary files /dev/null and b/tests/snapshots/chromium/datagrid/detail--open-detail-core-dark.png differ
diff --git a/tests/snapshots/chromium/datagrid/detail--open-detail-core-light.png b/tests/snapshots/chromium/datagrid/detail--open-detail-core-light.png
new file mode 100644
index 0000000000..64b5c8ea85
Binary files /dev/null and b/tests/snapshots/chromium/datagrid/detail--open-detail-core-light.png differ
diff --git a/tests/snapshots/chromium/datagrid/detail--open-detail-ng-dark.png b/tests/snapshots/chromium/datagrid/detail--open-detail-ng-dark.png
new file mode 100644
index 0000000000..0d6e0ebc81
Binary files /dev/null and b/tests/snapshots/chromium/datagrid/detail--open-detail-ng-dark.png differ
diff --git a/tests/snapshots/chromium/datagrid/detail--open-detail-ng-light.png b/tests/snapshots/chromium/datagrid/detail--open-detail-ng-light.png
new file mode 100644
index 0000000000..2611a0a004
Binary files /dev/null and b/tests/snapshots/chromium/datagrid/detail--open-detail-ng-light.png differ
diff --git a/tests/snapshots/firefox/datagrid/detail--variants-core-dark.png b/tests/snapshots/firefox/datagrid/detail--detail-core-dark.png
similarity index 100%
rename from tests/snapshots/firefox/datagrid/detail--variants-core-dark.png
rename to tests/snapshots/firefox/datagrid/detail--detail-core-dark.png
diff --git a/tests/snapshots/firefox/datagrid/detail--variants-core-light.png b/tests/snapshots/firefox/datagrid/detail--detail-core-light.png
similarity index 100%
rename from tests/snapshots/firefox/datagrid/detail--variants-core-light.png
rename to tests/snapshots/firefox/datagrid/detail--detail-core-light.png
diff --git a/tests/snapshots/firefox/datagrid/detail--variants-ng-dark.png b/tests/snapshots/firefox/datagrid/detail--detail-ng-dark.png
similarity index 100%
rename from tests/snapshots/firefox/datagrid/detail--variants-ng-dark.png
rename to tests/snapshots/firefox/datagrid/detail--detail-ng-dark.png
diff --git a/tests/snapshots/firefox/datagrid/detail--variants-ng-light.png b/tests/snapshots/firefox/datagrid/detail--detail-ng-light.png
similarity index 100%
rename from tests/snapshots/firefox/datagrid/detail--variants-ng-light.png
rename to tests/snapshots/firefox/datagrid/detail--detail-ng-light.png
diff --git a/tests/snapshots/firefox/datagrid/detail--open-detail-core-dark.png b/tests/snapshots/firefox/datagrid/detail--open-detail-core-dark.png
new file mode 100644
index 0000000000..fb07252194
Binary files /dev/null and b/tests/snapshots/firefox/datagrid/detail--open-detail-core-dark.png differ
diff --git a/tests/snapshots/firefox/datagrid/detail--open-detail-core-light.png b/tests/snapshots/firefox/datagrid/detail--open-detail-core-light.png
new file mode 100644
index 0000000000..6d13ff952e
Binary files /dev/null and b/tests/snapshots/firefox/datagrid/detail--open-detail-core-light.png differ
diff --git a/tests/snapshots/firefox/datagrid/detail--open-detail-ng-dark.png b/tests/snapshots/firefox/datagrid/detail--open-detail-ng-dark.png
new file mode 100644
index 0000000000..ff1ea343cb
Binary files /dev/null and b/tests/snapshots/firefox/datagrid/detail--open-detail-ng-dark.png differ
diff --git a/tests/snapshots/firefox/datagrid/detail--open-detail-ng-light.png b/tests/snapshots/firefox/datagrid/detail--open-detail-ng-light.png
new file mode 100644
index 0000000000..e972904b42
Binary files /dev/null and b/tests/snapshots/firefox/datagrid/detail--open-detail-ng-light.png differ