diff --git a/source/Ox.UI/js/Form/Button.js b/source/Ox.UI/js/Form/Button.js
index 25b918a3..9021bce1 100644
--- a/source/Ox.UI/js/Form/Button.js
+++ b/source/Ox.UI/js/Form/Button.js
@@ -69,10 +69,6 @@ Ox.Button = function(options, self) {
                     that.$element.css({width: (self.options.width - 14) + 'px'});
                 }
             })
-            .attr({
-                disabled: self.options.disabled,
-                type: self.options.type == 'text' ? 'button' : 'image'
-            })
             .addClass(
                 'OxButton Ox' + Ox.toTitleCase(self.options.size)
                 + (self.options.disabled ? ' OxDisabled': '')
@@ -80,6 +76,10 @@ Ox.Button = function(options, self) {
                 + (self.options.style != 'default' ? ' Ox' + Ox.toTitleCase(self.options.style) : '')
                 + (self.options.overlap != 'none' ? ' OxOverlap' + Ox.toTitleCase(self.options.overlap) : '')
             )
+            .attr({
+                disabled: self.options.disabled,
+                type: self.options.type == 'text' ? 'button' : 'image'
+            })
             .css(self.options.width == 'auto' ? {} : {
                 width: (self.options.width - 14) + 'px'
             })