diff --git a/Resources/config/routing/wdt.xml b/Resources/config/routing/wdt.xml
index 26bbd964..9f45f1b7 100644
--- a/Resources/config/routing/wdt.xml
+++ b/Resources/config/routing/wdt.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="_wdt_stylesheet" path="/styles.css">
+    <route id="_wdt_stylesheet" path="/styles">
         <default key="_controller">web_profiler.controller.profiler::toolbarStylesheetAction</default>
     </route>
 
diff --git a/Resources/views/Profiler/base_js.html.twig b/Resources/views/Profiler/base_js.html.twig
index 597a8095..d7deaff6 100644
--- a/Resources/views/Profiler/base_js.html.twig
+++ b/Resources/views/Profiler/base_js.html.twig
@@ -173,6 +173,12 @@
                 }
 
                 toggle.addEventListener('click', (e) => {
+                    const toggle = e.currentTarget;
+
+                    if (e.target.closest('a, .sf-toggle') !== toggle) {
+                        return;
+                    }
+
                     e.preventDefault();
 
                     if ('' !== window.getSelection().toString()) {
@@ -180,9 +186,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');
@@ -205,14 +208,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/Tests/Controller/ProfilerControllerTest.php b/Tests/Controller/ProfilerControllerTest.php
index 3933d30e..0e0a1e0a 100644
--- a/Tests/Controller/ProfilerControllerTest.php
+++ b/Tests/Controller/ProfilerControllerTest.php
@@ -152,15 +152,15 @@ public function testToolbarStylesheetActionWithProfilerDisabled()
 
     public function testToolbarStylesheetAction()
     {
-        $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
-        $twig = $this->createMock(Environment::class);
-        $profiler = $this->createMock(Profiler::class);
+        $kernel = new WebProfilerBundleKernel();
+        $client = new KernelBrowser($kernel);
 
-        $controller = new ProfilerController($urlGenerator, $profiler, $twig, []);
+        $client->request('GET', '/_wdt/styles');
+
+        $response = $client->getResponse();
 
-        $response = $controller->toolbarStylesheetAction();
         $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame('text/css', $response->headers->get('Content-Type'));
+        $this->assertSame('text/css; charset=UTF-8', $response->headers->get('Content-Type'));
         $this->assertSame('max-age=600, private', $response->headers->get('Cache-Control'));
     }