diff --git a/src/definitions/modules/transition.js b/src/definitions/modules/transition.js
index 0373a7c59..ed7760b8a 100644
--- a/src/definitions/modules/transition.js
+++ b/src/definitions/modules/transition.js
@@ -278,11 +278,11 @@ $.fn.transition = function() {
             module.verbose('Setting animation duration', duration);
             $module
               .css({
-                '-webkit-animation-duration': duration,
-                '-moz-animation-duration': duration,
-                '-ms-animation-duration': duration,
-                '-o-animation-duration': duration,
-                'animation-duration': duration
+                '-webkit-animation-duration': duration + '0s 0s',
+                '-moz-animation-duration': duration + '0s 0s',
+                '-ms-animation-duration': duration + '0s 0s',
+                '-o-animation-duration': duration + '0s 0s',
+                'animation-duration': duration + '0s 0s'
               })
             ;
           },
diff --git a/src/themes/default/modules/transition.overrides b/src/themes/default/modules/transition.overrides
index 19eea2813..4380ee776 100644
--- a/src/themes/default/modules/transition.overrides
+++ b/src/themes/default/modules/transition.overrides
@@ -151,14 +151,12 @@
 .flip.transition.out {
   perspective: 2000px;
 }
-.horizontal.flip.transition.in,
-.horizontal.flip.transition.out {
+.horizontal.flip.transition.in {
   animation-name: horizontalFlipIn;
 }
 .horizontal.flip.transition.out {
   animation-name: horizontalFlipOut;
 }
-.vertical.flip.transition.in,
 .vertical.flip.transition.out {
   animation-name: verticalFlipIn;
 }