diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js
index d50f205..52c8d49 100644
--- a/modules/toolbar/toolbar.js
+++ b/modules/toolbar/toolbar.js
@@ -1,6 +1,12 @@
 (function ($) {
 
 Drupal.toolbar = Drupal.toolbar || {};
+// Since some selectors are being used in a resize handler lets cache them.
+// Need them available to all functions in the file so define here but for
+// edge-case of DOM not being loaded yet, set the selectors in Drupal.behaviors.
+var $body
+var $toolbar
+var toolbarHeightModifier = 0;
 
 /**
  * Attach toggling behavior and notify the overlay of the toolbar.
@@ -8,6 +14,9 @@ Drupal.toolbar = Drupal.toolbar || {};
 Drupal.behaviors.toolbar = {
   attach: function(context) {
 
+    $body = $('body');
+    $toolbar = $('#toolbar');
+
     // Set the initial state of the toolbar.
     $('#toolbar', context).once('toolbar', Drupal.toolbar.init);
 
@@ -27,6 +36,16 @@ Drupal.behaviors.toolbar = {
 Drupal.toolbar.init = function() {
   // Retrieve the collapsed status from a stored cookie.
   var collapsed = $.cookie('Drupal.toolbar.collapsed');
+  var bodyPaddingTop = parseInt($body.css('padding-top'),10);
+  // In modern browsers (including IE9), when box-shadow is defined, use the
+  // normal height.
+  var cssBoxShadowValue = $toolbar.css('box-shadow');
+  var boxShadow = (typeof cssBoxShadowValue !== 'undefined' && cssBoxShadowValue !== 'none');
+  // In IE8 and below, we use the shadow filter to apply box-shadow styles to
+  // the toolbar. It adds some extra height that we need to remove.
+  if (!boxShadow && /DXImageTransform\.Microsoft\.Shadow/.test($toolbar.css('filter'))) {
+    toolbarHeightModifier = $toolbar[0].filters.item("DXImageTransform.Microsoft.Shadow").strength;
+  }
 
   // Expand or collapse the toolbar based on the cookie value.
   if (collapsed == 1) {
@@ -35,6 +54,15 @@ Drupal.toolbar.init = function() {
   else {
     Drupal.toolbar.expand();
   }
+
+  // Adjust body's padding-top as needed so the toolbar doesn't cover content.
+  $(window).resize(function () {
+    var height = Drupal.toolbar.height();
+    if (bodyPaddingTop !== height) {
+      bodyPaddingTop = height;
+      $body.css('padding-top', bodyPaddingTop);
+    }
+  });
 };
 
 /**
@@ -47,7 +75,7 @@ Drupal.toolbar.collapse = function() {
     .removeClass('toggle-active')
     .attr('title',  toggle_text)
     .html(toggle_text);
-  $('body').removeClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height());
+  $body.removeClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height());
   $.cookie(
     'Drupal.toolbar.collapsed',
     1,
@@ -69,7 +97,7 @@ Drupal.toolbar.expand = function() {
     .addClass('toggle-active')
     .attr('title',  toggle_text)
     .html(toggle_text);
-  $('body').addClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height());
+  $body.addClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height());
   $.cookie(
     'Drupal.toolbar.collapsed',
     0,
@@ -94,18 +122,7 @@ Drupal.toolbar.toggle = function() {
 };
 
 Drupal.toolbar.height = function() {
-  var $toolbar = $('#toolbar');
-  var height = $toolbar.outerHeight();
-  // In modern browsers (including IE9), when box-shadow is defined, use the
-  // normal height.
-  var cssBoxShadowValue = $toolbar.css('box-shadow');
-  var boxShadow = (typeof cssBoxShadowValue !== 'undefined' && cssBoxShadowValue !== 'none');
-  // In IE8 and below, we use the shadow filter to apply box-shadow styles to
-  // the toolbar. It adds some extra height that we need to remove.
-  if (!boxShadow && /DXImageTransform\.Microsoft\.Shadow/.test($toolbar.css('filter'))) {
-    height -= $toolbar[0].filters.item("DXImageTransform.Microsoft.Shadow").strength;
-  }
-  return height;
+  return $toolbar.outerHeight() - toolbarHeightModifier;
 };
 
 })(jQuery);