diff --git a/core/modules/toolbar/toolbar.js b/core/modules/toolbar/toolbar.js
index 5b61634..bf51838 100644
--- a/core/modules/toolbar/toolbar.js
+++ b/core/modules/toolbar/toolbar.js
@@ -95,11 +95,18 @@ Drupal.toolbar.toggle = function() {
 
 Drupal.toolbar.height = function() {
   var height = $('#toolbar').outerHeight();
-  // In IE, Shadow filter adds some extra height, so we need to remove it from
-  // the returned height.
-  if ($('#toolbar').css('filter').match(/DXImageTransform\.Microsoft\.Shadow/)) {
+
+  // In modern browsers (including IE9), when box-shadow is defined, use the
+  // normal height.
+  if (typeof $('#toolbar').css('box-shadow') != 'undefined' && $('#toolbar').css('box-shadow') != 'none') {
+    return height;
+  }
+  // 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.
+  else if ($('#toolbar').css('filter').match(/DXImageTransform\.Microsoft\.Shadow/)) {
     height -= $('#toolbar').get(0).filters.item("DXImageTransform.Microsoft.Shadow").strength;
   }
+
   return height;
 };