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 73bdd894b68..4d5c4b1dc52 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
@@ -89,6 +89,7 @@
             if (this.firstChild &&
                     typeof this.firstChild.click === "function" &&
                         event.target === this ){
+            	event.stopPropagation();
                 this.firstChild.click();
             }
         });
diff --git a/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.js b/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.js
index f9c5bd6919b..602d715d61b 100644
--- a/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.js
+++ b/flow-data/src/main/resources/META-INF/resources/frontend/flow-component-renderer.js
@@ -93,6 +93,7 @@ class FlowComponentRenderer extends PolymerElement {
           if (this.firstChild &&
                   typeof this.firstChild.click === "function" &&
                       event.target === this ){
+              event.stopPropagation();
               this.firstChild.click();
           }
       });