diff --git a/AUTHORS.txt b/AUTHORS.txt
index 0856478f2..18756d281 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -211,4 +211,5 @@ Roman Reiß <me@silverwind.io>
 Benjy Cui <benjytrys@gmail.com>
 Rodrigo Rosenfeld Rosas <rr.rosas@gmail.com>
 John Hoven <hovenj@gmail.com>
+Christian Kosmowski <ksmwsk@gmail.com>
 
diff --git a/src/css.js b/src/css.js
index 31f551eb1..2c88f2bc3 100644
--- a/src/css.js
+++ b/src/css.js
@@ -350,7 +350,7 @@ jQuery.each([ "height", "width" ], function( i, name ) {
 			if ( computed ) {
 				// certain elements can have dimension info if we invisibly show them
 				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
 					jQuery.swap( elem, cssShow, function() {
 						return getWidthOrHeight( elem, name, extra );
 					}) :