diff --git a/packages/calcite-components/src/components/button/button.scss b/packages/calcite-components/src/components/button/button.scss
index 0c9939090f8..98438744ed9 100644
--- a/packages/calcite-components/src/components/button/button.scss
+++ b/packages/calcite-components/src/components/button/button.scss
@@ -160,7 +160,7 @@
@include disabled();
-:host([loading]) {
+:host([loading]:not([disabled])) {
@extend %non-interactive-host-contents;
button,
diff --git a/packages/calcite-components/src/components/button/button.stories.ts b/packages/calcite-components/src/components/button/button.stories.ts
index 911613a18af..349359f5514 100644
--- a/packages/calcite-components/src/components/button/button.stories.ts
+++ b/packages/calcite-components/src/components/button/button.stories.ts
@@ -107,7 +107,11 @@ export const setWidthContainer = (): string => html`
`;
-export const disabled_TestOnly = (): string => html`disabled`;
+export const disabled_TestOnly = (): string => html`
+ disabled
+
+ loading + disabled
+`;
export const withIconStartEmpty_TestOnly = (): string => html` Button `;
diff --git a/packages/calcite-components/src/components/fab/fab.stories.ts b/packages/calcite-components/src/components/fab/fab.stories.ts
index fc7008a9ac9..7a7e9fe6526 100644
--- a/packages/calcite-components/src/components/fab/fab.stories.ts
+++ b/packages/calcite-components/src/components/fab/fab.stories.ts
@@ -94,7 +94,11 @@ const createAttributes: (options?: { exceptions: string[] }) => Attributes = ({
};
export const simple = (): string => create("calcite-fab", createAttributes());
-export const disabled_TestOnly = (): string => html``;
+export const disabled_TestOnly = (): string => html`
+
+
+
+`;
export const darkModeRTL_TestOnly = (): string =>
create(
diff --git a/packages/calcite-components/src/components/inline-editable/inline-editable.stories.ts b/packages/calcite-components/src/components/inline-editable/inline-editable.stories.ts
index ee9a5bdfe49..31892847806 100644
--- a/packages/calcite-components/src/components/inline-editable/inline-editable.stories.ts
+++ b/packages/calcite-components/src/components/inline-editable/inline-editable.stories.ts
@@ -30,9 +30,15 @@ export const simple = (): string => html`
`;
-export const disabled_TestOnly = (): string => html`
-
-`;
+export const disabled_TestOnly = (): string => html`
+
+
+
+
+
+
+
+`;
export const darkModeRTL_TestOnly = (): string => html`
diff --git a/packages/calcite-components/src/components/split-button/split-button.stories.ts b/packages/calcite-components/src/components/split-button/split-button.stories.ts
index 7b7fab0a5ac..0fad58fcf40 100644
--- a/packages/calcite-components/src/components/split-button/split-button.stories.ts
+++ b/packages/calcite-components/src/components/split-button/split-button.stories.ts
@@ -112,13 +112,23 @@ export const darkModeRTL_TestOnly = (): string => html`
darkModeRTL_TestOnly.parameters = { modes: modesDarkDefault };
-export const disabled_TestOnly = (): string => html`
-
- Option 2
- Option 3
- Option 4
-
-`;
+export const disabled_TestOnly = (): string => html`
+
+
+ Option 2
+ Option 3
+ Option 4
+
+
+
+
+
+ Option 2
+ Option 3
+ Option 4
+
+
+`;
export const appearanceAndKindCombinations_TestOnly = (): string => html`
@@ -161,3 +171,5 @@ export const appearanceAndKindCombinations_TestOnly = (): string => html`
kind="neutral"
>
`;
+
+export const loadingAndDisabled_TestOnly = (): string => html`Test`;