diff --git a/ts/lib/components/TitledContainer.svelte b/ts/lib/components/TitledContainer.svelte
index 70e4a078c..3ea932ba3 100644
--- a/ts/lib/components/TitledContainer.svelte
+++ b/ts/lib/components/TitledContainer.svelte
@@ -12,7 +12,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export { className as class };
 
     export let title: string;
-    export let onTitleClick: ((_e: MouseEvent | KeyboardEvent) => void) | null = null;
 </script>
 
 <div
@@ -25,22 +24,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     style:--container-margin="0"
 >
     <div class="position-relative">
-        {#if onTitleClick}
-            <span
-                on:click={onTitleClick}
-                on:keydown={onTitleClick}
-                role="button"
-                tabindex="0"
-            >
-                <h1>
-                    {title}
-                </h1>
-            </span>
-        {:else}
-            <h1>
-                {title}
-            </h1>
-        {/if}
+        <h1>
+            {title}
+        </h1>
         <div class="help-badge position-absolute" class:rtl>
             <slot name="tooltip" />
         </div>
diff --git a/ts/routes/graphs/Graph.svelte b/ts/routes/graphs/Graph.svelte
index 2c509639e..c8da588c5 100644
--- a/ts/routes/graphs/Graph.svelte
+++ b/ts/routes/graphs/Graph.svelte
@@ -8,7 +8,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     // When title is null (default), the graph is inlined, not having TitledContainer wrapper.
     export let title: string | null = null;
     export let subtitle: string | null = null;
-    export let onTitleClick: ((_e: MouseEvent | KeyboardEvent) => void) | null = null;
 </script>
 
 {#if title == null}
@@ -19,8 +18,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <slot />
     </div>
 {:else}
-    <TitledContainer class="d-flex flex-column" {title} {onTitleClick}>
-        <slot slot="tooltip" name="tooltip"></slot>
+    <TitledContainer class="d-flex flex-column" {title}>
+        <slot name="tooltip" slot="tooltip"></slot>
         <div class="graph d-flex flex-grow-1 flex-column justify-content-center">
             {#if subtitle}
                 <div class="subtitle">{subtitle}</div>
diff --git a/ts/routes/graphs/TrueRetention.svelte b/ts/routes/graphs/TrueRetention.svelte
index 6b89ab9b8..4a9738831 100644
--- a/ts/routes/graphs/TrueRetention.svelte
+++ b/ts/routes/graphs/TrueRetention.svelte
@@ -57,22 +57,29 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const title = tr.statisticsTrueRetentionTitle();
     const subtitle = tr.statisticsTrueRetentionSubtitle();
-    const onTitleClick = () => {
+    const onHelpClick = () => {
         openHelpModal(Object.keys(retentionHelp).indexOf("trueRetention"));
     };
 </script>
 
-<Graph {title} {subtitle} {onTitleClick}>
-    <HelpModal
-        title={tr.statisticsTrueRetentionTitle()}
-        url={HelpPage.DeckOptions.fsrs}
+<Graph {title} {subtitle}>
+    <div
         slot="tooltip"
-        {helpSections}
-        on:mount={(e) => {
-            modal = e.detail.modal;
-            carousel = e.detail.carousel;
-        }}
-    />
+        onclick={onHelpClick}
+        onkeydown={onHelpClick}
+        role="button"
+        tabindex="-1"
+    >
+        <HelpModal
+            title={tr.statisticsTrueRetentionTitle()}
+            url={HelpPage.DeckOptions.fsrs}
+            {helpSections}
+            on:mount={(e) => {
+                modal = e.detail.modal;
+                carousel = e.detail.carousel;
+            }}
+        />
+    </div>
     <InputBox>
         <label>
             <input type="radio" bind:group={mode} value={DisplayMode.Young} />