diff --git a/packages/buttons/src/views/Button.js b/packages/buttons/src/views/Button.js
index dba00ab4233..c95b4fc0d6e 100644
--- a/packages/buttons/src/views/Button.js
+++ b/packages/buttons/src/views/Button.js
@@ -40,7 +40,7 @@ const StyledButton = styled.button.attrs({
}) =>
classNames(ButtonStyles['c-btn'], {
// Danger styling
- [ButtonStyles['c-btn--danger']]: danger,
+ [ButtonStyles['c-btn--danger']]: !disabled && danger,
// Styles
[ButtonStyles['c-btn--primary']]: primary,
diff --git a/packages/buttons/src/views/Button.spec.js b/packages/buttons/src/views/Button.spec.js
index 0a117f4039a..40738ba8572 100644
--- a/packages/buttons/src/views/Button.spec.js
+++ b/packages/buttons/src/views/Button.spec.js
@@ -22,6 +22,12 @@ describe('Button', () => {
expect(wrapper).toMatchSnapshot();
});
+ it('renders correct combination of danger and disabled styling if provided', () => {
+ const wrapper = mount();
+
+ expect(wrapper).toMatchSnapshot();
+ });
+
it('renders stretched styling if provided', () => {
const wrapper = mount();
diff --git a/packages/buttons/src/views/__snapshots__/Button.spec.js.snap b/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
index e7c502996b2..39f0822c782 100644
--- a/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
+++ b/packages/buttons/src/views/__snapshots__/Button.spec.js.snap
@@ -340,6 +340,37 @@ exports[`Button Types renders primary styling if provided 1`] = `
`;
+exports[`Button renders correct combination of danger and disabled styling if provided 1`] = `
+
+`;
+
exports[`Button renders danger styling if provided 1`] = `