diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
index 761c93e1f8..f3678b5541 100755
--- a/src/definitions/modules/dimmer.js
+++ b/src/definitions/modules/dimmer.js
@@ -335,15 +335,12 @@ $.fn.dimmer = function(parameters) {
             return $dimmer;
           },
           duration: function() {
-            if(typeof settings.duration == 'object') {
-              if( module.is.active() ) {
-                return settings.duration.hide;
-              }
-              else {
-                return settings.duration.show;
-              }
+            if( module.is.active() ) {
+              return settings.transition.hideDuration || settings.duration.hide || settings.duration;
+            }
+            else {
+              return settings.transition.showDuration || settings.duration.show || settings.duration;
             }
-            return settings.duration;
           }
         },