diff --git a/src/elements/custom-style.html b/src/elements/custom-style.html
index d1309eb1..9d6e2ef6 100644
--- a/src/elements/custom-style.html
+++ b/src/elements/custom-style.html
@@ -41,7 +41,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     }
   }
 
-  window.CustomStyle = CustomStyle;
   window.customElements.define('custom-style', CustomStyle);
+  Polymer.CustomStyle = CustomStyle;
 })();
 </script>