diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js
index c7585a8..1a8f0e7 100644
--- a/src/components/Button/Button.js
+++ b/src/components/Button/Button.js
@@ -38,22 +38,22 @@ const StyledButton = styled.button`
           ${createBoxStyles()};
           border: 2px solid transparent;
           &:hover {
-            ${createWellBorderStyles(false)}
+            ${({ isDisabled }) => !isDisabled && createWellBorderStyles(false)}
           }
           &:active {
-            ${createWellBorderStyles(true)}
+            ${({ isDisabled }) => !isDisabled && createWellBorderStyles(true)}
           }
           ${({ active }) => active && createBorderStyles(true)}
+          ${({ isDisabled }) => isDisabled && createDisabledTextStyles()}
         `
       : css`
           ${createBoxStyles()};
           ${({ active }) =>
             active ? createBorderStyles(true) : createBorderStyles(false)}
-          ${({ isDisabled }) =>
-            isDisabled && createDisabledTextStyles()}
-        &:active {
+          &:active {
             ${({ isDisabled }) => !isDisabled && createBorderStyles(true)}
           }
+          ${({ isDisabled }) => isDisabled && createDisabledTextStyles()}
         `}
   ${commonButtonStyles}
 `;
diff --git a/src/components/Window/Window.stories.js b/src/components/Window/Window.stories.js
index f275af9..3324d0d 100644
--- a/src/components/Window/Window.stories.js
+++ b/src/components/Window/Window.stories.js
@@ -28,7 +28,7 @@ storiesOf("Window", module)
         <Button variant="menu" size="sm">
           Edit
         </Button>
-        <Button variant="menu" size="sm">
+        <Button variant="menu" size="sm" disabled>
           Save
         </Button>
       </Toolbar>