diff --git a/paper-input-container.html b/paper-input-container.html
index b886364a..d7e7e844 100644
--- a/paper-input-container.html
+++ b/paper-input-container.html
@@ -521,7 +521,7 @@
       if (!this._addons) {
         this._addons = [];
       }
-      var target = event.target;
+      var target = event.composedPath ? event.composedPath()[0] : event.target;
       if (this._addons.indexOf(target) === -1) {
         this._addons.push(target);
         if (this.isAttached) {