diff --git a/lib/app/index.html b/lib/app/index.html
index 8aa61f65..d781fc06 100644
--- a/lib/app/index.html
+++ b/lib/app/index.html
@@ -30,7 +30,7 @@
       addCssLink('{{{appRoot}}}/styleguide-app.css', {noReload: true});
 
       // Use Shadow DOM but fallback to global styles if shadow DOM is not supported
-      if (typeof head.createShadowRoot !== 'function' || _styleguideConfig.disableEncapsulation) {
+      if (typeof head.attachShadow !== 'function' || _styleguideConfig.disableEncapsulation) {
         userStyleFiles.forEach(addCssLink);
       }
 
diff --git a/lib/app/js/directives/shadowDom.js b/lib/app/js/directives/shadowDom.js
index 8c730611..866178f5 100644
--- a/lib/app/js/directives/shadowDom.js
+++ b/lib/app/js/directives/shadowDom.js
@@ -13,9 +13,11 @@ angular.module('sgApp')
         scope.$watch(function() {
           return Styleguide.config;
         }, function() {
-          if (typeof element[0].createShadowRoot === 'function' && (Styleguide.config && Styleguide.config.data && !Styleguide.config.data.disableEncapsulation)) {
+          if (typeof element[0].attachShadow === 'function' && (Styleguide.config && Styleguide.config.data && !Styleguide.config.data.disableEncapsulation)) {
             angular.element(element[0]).empty();
-            var root = angular.element(element[0].createShadowRoot());
+            var root = angular.element(element[0].attachShadow({
+              mode: 'open'
+            }));
             root.append($templateCache.get(USER_STYLES_TEMPLATE));
             transclude(function(clone) {
               root.append(clone);
diff --git a/test/angular/unit/directives/shadowDom.test.js b/test/angular/unit/directives/shadowDom.test.js
index 808740f7..5a444519 100644
--- a/test/angular/unit/directives/shadowDom.test.js
+++ b/test/angular/unit/directives/shadowDom.test.js
@@ -1,6 +1,6 @@
 describe('shadowDom directive', function() {
 
-  var $scope, elem, shadowRoot, originalCreateShadowRoot, result,
+  var $scope, elem, shadowRoot, originalAttachShadow, result,
     styleguideMock,
     userStyleTemplate = '<style>@import(\'style.css\');</style>',
     html = '<shadow-dom><p>hi!</p></shadow-dom>';
@@ -16,9 +16,9 @@ describe('shadowDom directive', function() {
     $provide.value('Styleguide', styleguideMock);
   }));
 
-  describe('when Element.createShadowRoot is a function', function() {
-    before(mockCreateShadowRoot);
-    after(restoreCreateShadowRoot);
+  describe('when Element.attachShadow is a function', function() {
+    before(mockAttachShadow);
+    after(restoreAttachShadow);
     beforeEach(create);
 
     it('creates a shadow root', function() {
@@ -34,9 +34,9 @@ describe('shadowDom directive', function() {
     });
   });
 
-  describe('when Element.createShadowRoot is a not a function', function() {
-    before(disableCreateShadowRoot);
-    after(restoreCreateShadowRoot);
+  describe('when Element.attachShadow is a not a function', function() {
+    before(disableAttachShadow);
+    after(restoreAttachShadow);
     beforeEach(create);
 
     it('does not create a shadow root', function() {
@@ -71,23 +71,26 @@ describe('shadowDom directive', function() {
     });
   });
 
-  function mockCreateShadowRoot() {
-    originalCreateShadowRoot = Element.prototype.createShadowRoot;
-    if (typeof Element.prototype.createShadowRoot !== 'function') {
-      Element.prototype.createShadowRoot = function() {
+  function mockAttachShadow() {
+    originalAttachShadow = Element.prototype.attachShadow;
+    if (typeof Element.prototype.attachShadow !== 'function') {
+      Element.prototype.attachShadow = function(shadowRootInit) {
         shadowRoot = document.createElement('div');
-        return shadowRoot;
+        if (shadowRootInit.mode === 'open') {
+          return shadowRoot;
+        }
+        return null;
       };
     }
   }
 
-  function disableCreateShadowRoot() {
-    originalCreateShadowRoot = Element.prototype.createShadowRoot;
-    Element.prototype.createShadowRoot = undefined;
+  function disableAttachShadow() {
+    originalAttachShadow = Element.prototype.attachShadow;
+    Element.prototype.attachShadow = undefined;
   }
 
-  function restoreCreateShadowRoot() {
-    Element.prototype.createShadowRoot = originalCreateShadowRoot;
+  function restoreAttachShadow() {
+    Element.prototype.attachShadow = originalAttachShadow;
   }
 
   function create() {