diff --git a/ionic/components/app/normalize.scss b/ionic/components/app/normalize.scss
index 578b1038a0..bcc2795f75 100644
--- a/ionic/components/app/normalize.scss
+++ b/ionic/components/app/normalize.scss
@@ -127,7 +127,8 @@ button {
 }
 
 // Re-set default cursor for disabled elements.
-.button-disabled,
+a[disabled],
+button[disabled]
 html input[disabled] {
   cursor: default;
 }
diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss
index 3a30935ded..02297c4072 100644
--- a/ionic/components/button/button.scss
+++ b/ionic/components/button/button.scss
@@ -35,7 +35,7 @@ a.button {
   text-decoration: none;
 }
 
-.button-disabled {
+.button[disabled] {
   opacity: 0.4;
   cursor: default !important;
   pointer-events: none;
diff --git a/ionic/components/button/test/basic/main.html b/ionic/components/button/test/basic/main.html
index 28341090bb..634fabca7b 100644
--- a/ionic/components/button/test/basic/main.html
+++ b/ionic/components/button/test/basic/main.html
@@ -35,4 +35,8 @@
     <button dark class="activated">Dark.activated</button>
   </p>
 
+  <p>
+    <button disabled>Disabled</button>
+  </p>
+
 </ion-content>