diff --git a/ts/lib/components/TitledContainer.svelte b/ts/lib/components/TitledContainer.svelte
index 98983940a..70e4a078c 100644
--- a/ts/lib/components/TitledContainer.svelte
+++ b/ts/lib/components/TitledContainer.svelte
@@ -12,7 +12,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export { className as class };
 
     export let title: string;
-    export let onHelpClick: ((_e: MouseEvent | KeyboardEvent) => void) | null = null;
+    export let onTitleClick: ((_e: MouseEvent | KeyboardEvent) => void) | null = null;
 </script>
 
 <div
@@ -25,21 +25,25 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     style:--container-margin="0"
 >
     <div class="position-relative">
-        <h1>
-            {title}
-        </h1>
-        {#if onHelpClick}
-            <div
-                on:click={onHelpClick}
-                on:keydown={onHelpClick}
+        {#if onTitleClick}
+            <span
+                on:click={onTitleClick}
+                on:keydown={onTitleClick}
                 role="button"
                 tabindex="0"
-                class="help-badge position-absolute"
-                class:rtl
             >
-                <slot name="tooltip" />
-            </div>
+                <h1>
+                    {title}
+                </h1>
+            </span>
+        {:else}
+            <h1>
+                {title}
+            </h1>
         {/if}
+        <div class="help-badge position-absolute" class:rtl>
+            <slot name="tooltip" />
+        </div>
     </div>
     <slot />
 </div>
diff --git a/ts/routes/graphs/Graph.svelte b/ts/routes/graphs/Graph.svelte
index 1dafed4bb..2c509639e 100644
--- a/ts/routes/graphs/Graph.svelte
+++ b/ts/routes/graphs/Graph.svelte
@@ -8,7 +8,7 @@ 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 onHelpClick: ((_e: MouseEvent | KeyboardEvent) => void) | null = null;
+    export let onTitleClick: ((_e: MouseEvent | KeyboardEvent) => void) | null = null;
 </script>
 
 {#if title == null}
@@ -19,7 +19,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <slot />
     </div>
 {:else}
-    <TitledContainer class="d-flex flex-column" {title} {onHelpClick}>
+    <TitledContainer class="d-flex flex-column" {title} {onTitleClick}>
         <slot slot="tooltip" name="tooltip"></slot>
         <div class="graph d-flex flex-grow-1 flex-column justify-content-center">
             {#if subtitle}
diff --git a/ts/routes/graphs/TrueRetention.svelte b/ts/routes/graphs/TrueRetention.svelte
index 9af2b4d85..6b89ab9b8 100644
--- a/ts/routes/graphs/TrueRetention.svelte
+++ b/ts/routes/graphs/TrueRetention.svelte
@@ -57,12 +57,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const title = tr.statisticsTrueRetentionTitle();
     const subtitle = tr.statisticsTrueRetentionSubtitle();
-    const onHelpClick = () => {
+    const onTitleClick = () => {
         openHelpModal(Object.keys(retentionHelp).indexOf("trueRetention"));
     };
 </script>
 
-<Graph {title} {subtitle} {onHelpClick}>
+<Graph {title} {subtitle} {onTitleClick}>
     <HelpModal
         title={tr.statisticsTrueRetentionTitle()}
         url={HelpPage.DeckOptions.fsrs}