diff --git a/select2.js b/select2.js
index d4960a53..4884a0fb 100755
--- a/select2.js
+++ b/select2.js
@@ -1033,7 +1033,7 @@
                         return matches[1];
                 }
             }
-            return this.opts.element.width() + 'px';
+            return (this.opts.element.width() === 0 ? 'auto' : this.opts.element.width() + 'px');
         }
     });