diff --git a/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.html b/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.html
index d7d7c22f9a9..3f940fc1a47 100644
--- a/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.html
+++ b/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.html
@@ -19,6 +19,17 @@
       ]
     }
     
+    ready(){
+        super.ready();
+        this.addEventListener("click", function(event){
+            if (this.firstChild && 
+                    typeof this.firstChild.click === "function" && 
+                        event.target === this ){
+                this.firstChild.click();
+            }
+        });
+    }
+    
     _asyncAttachRenderedComponentIfAble() {
       this._debouncer = Polymer.Debouncer.debounce(
         this._debouncer,