diff --git a/js/sticky-edit-actions.js b/js/sticky-edit-actions.js
index 20cac75..89a9722 100644
--- a/js/sticky-edit-actions.js
+++ b/js/sticky-edit-actions.js
@@ -20,14 +20,17 @@
       // Set width of .my-sticky-element to that of .sticky-wrapper. We must do
       // this because once we 'position: fixed' in CSS it comes out of the DOM
       // flow and is uncontrollable by percentage.
-      function setStickyElementWidth() {
-        var stickyWidth = $('.sticky-wrapper').width();
-        $('.my-sticky-element').width(stickyWidth);
+      function setStickyElementWidthAndHeight() {
+        $('.my-sticky-element').each(function (e) {
+          $this = $(this);
+          $this.width( $this.parent().width() );
+          $this.parent().height( $this.outerHeight() );
+        });
       }
       // First set it on page load.
-      setStickyElementWidth();
+      setStickyElementWidthAndHeight();
       // Then continue to set the width on resize events.
-      $(window).resize(setStickyElementWidth);
+      $(window).resize(setStickyElementWidthAndHeight);
     }
   };
 
@@ -35,7 +38,7 @@
    * OVERRIDING this function from collapse.js so we can add some
    * callbacks to slideDown & slideUp(). The .click() handler will not work on
    * fieldsets.
-   * 
+   *
    * Toggle the visibility of a fieldset using smooth animations.
    */
   Drupal.toggleFieldset = function (fieldset) {
diff --git a/js/waypoints-sticky.js b/js/waypoints-sticky.js
index d65a80d..5e04d86 100644
--- a/js/waypoints-sticky.js
+++ b/js/waypoints-sticky.js
@@ -24,12 +24,6 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
     };
     wrap = function($elements, options) {
       $elements.wrap(options.wrapper);
-      $elements.each(function() {
-        var $this;
-        $this = $(this);
-        $this.parent().height($this.outerHeight());
-        return true;
-      });
       return $elements.parent();
     };
     return $.waypoints('extendFn', 'sticky', function(options) {
diff --git a/js/waypoints-sticky.min.js b/js/waypoints-sticky.min.js
index b1ab848..a63d576 100644
--- a/js/waypoints-sticky.min.js
+++ b/js/waypoints-sticky.min.js
@@ -5,4 +5,4 @@ Copyright (c) 2011-2013 Caleb Troughton
 Dual licensed under the MIT license and GPL license.
 https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
 */
-(function(){(function(t,n){if(typeof define==="function"&&define.amd){return define(["jquery","waypoints"],n)}else{return n(t.jQuery)}})(this,function(t){var n,e;n={wrapper:'<div class="sticky-wrapper" />',stuckClass:"stuck"};e=function(n,e){n.wrap(e.wrapper);n.each(function(){var n;n=t(this);n.parent().height(n.outerHeight());return true});return n.parent()};return t.waypoints("extendFn","sticky",function(r){var i,a;r=t.extend({},t.fn.waypoint.defaults,n,r);i=e(this,r);a=r.handler;r.handler=function(n){var e,i;e=t(this).children(":first");i=n==="down"||n==="right";e.toggleClass(r.stuckClass,i);if(a!=null){return a.call(this,n)}};i.waypoint(r);return this})})}).call(this);
\ No newline at end of file
+(function(){(function(t,n){if(typeof define==="function"&&define.amd){return define(["jquery","waypoints"],n)}else{return n(t.jQuery)}})(this,function(t){var n,e;n={wrapper:'<div class="sticky-wrapper" />',stuckClass:"stuck"};e=function(n,e){n.wrap(e.wrapper);return n.parent()};return t.waypoints("extendFn","sticky",function(r){var i,a;r=t.extend({},t.fn.waypoint.defaults,n,r);i=e(this,r);a=r.handler;r.handler=function(n){var e,i;e=t(this).children(":first");i=n==="down"||n==="right";e.toggleClass(r.stuckClass,i);if(a!=null){return a.call(this,n)}};i.waypoint(r);return this})})}).call(this);