diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index f81781066e0b6..839ea59d3f570 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -122,6 +122,12 @@
                 }
 
                 toggle.addEventListener('click', (e) => {
+                    const toggle = e.currentTarget;
+
+                    if (e.target.closest('a, .sf-toggle') !== toggle) {
+                        return;
+                    }
+
                     e.preventDefault();
 
                     if ('' !== window.getSelection().toString()) {
@@ -129,9 +135,6 @@
                         return;
                     }
 
-                    /* needed because when the toggle contains HTML contents, user can click */
-                    /* on any of those elements instead of their parent '.sf-toggle' element */
-                    const toggle = e.target.closest('.sf-toggle');
                     const element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
 
                     toggle.classList.toggle('sf-toggle-on');
@@ -154,14 +157,6 @@
                     toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
                 });
 
-                /* Prevents from disallowing clicks on links inside toggles */
-                const toggleLinks = toggle.querySelectorAll('a');
-                toggleLinks.forEach((toggleLink) => {
-                    toggleLink.addEventListener('click', (e) => {
-                        e.stopPropagation();
-                    });
-                });
-
                 toggle.setAttribute('data-processed', 'true');
             });
         }
diff --git a/src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js b/src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js
index 22ce675dfb7d2..89c0083348afb 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js
+++ b/src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js
@@ -145,19 +145,17 @@
             }
 
             addEventListener(toggles[i], 'click', function(e) {
-                e.preventDefault();
+                var toggle = e.currentTarget;
 
-                if ('' !== window.getSelection().toString()) {
-                    /* Don't do anything on text selection */
+                if (e.target.closest('a, span[data-clipboard-text], .sf-toggle') !== toggle) {
                     return;
                 }
 
-                var toggle = e.target || e.srcElement;
+                e.preventDefault();
 
-                /* needed because when the toggle contains HTML contents, user can click */
-                /* on any of those elements instead of their parent '.sf-toggle' element */
-                while (!hasClass(toggle, 'sf-toggle')) {
-                    toggle = toggle.parentNode;
+                if ('' !== window.getSelection().toString()) {
+                    /* Don't do anything on text selection */
+                    return;
                 }
 
                 var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
@@ -182,22 +180,6 @@
                 toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
             });
 
-            /* Prevents from disallowing clicks on links inside toggles */
-            var toggleLinks = toggles[i].querySelectorAll('a');
-            for (var j = 0; j < toggleLinks.length; j++) {
-                addEventListener(toggleLinks[j], 'click', function(e) {
-                    e.stopPropagation();
-                });
-            }
-
-            /* Prevents from disallowing clicks on "copy to clipboard" elements inside toggles */
-            var copyToClipboardElements = toggles[i].querySelectorAll('span[data-clipboard-text]');
-            for (var k = 0; k < copyToClipboardElements.length; k++) {
-                addEventListener(copyToClipboardElements[k], 'click', function(e) {
-                    e.stopPropagation();
-                });
-            }
-
             toggles[i].setAttribute('data-processed', 'true');
         }
     })();