diff --git a/ts/graphs/Graph.svelte b/ts/graphs/Graph.svelte
index 8ee040fd4..9b4ed79c8 100644
--- a/ts/graphs/Graph.svelte
+++ b/ts/graphs/Graph.svelte
@@ -42,6 +42,9 @@
                  * marked the ticks as odd */
                 display: none;
             }
+
+        &:focus {
+            outline: 0;
         }
     }
 
@@ -57,7 +60,7 @@
     }
 </style>
 
-<div class="graph">
+<div class="graph" tabindex="-1">
     <h1>{title}</h1>
 
     {#if subtitle}
diff --git a/ts/graphs/GraphsPage.svelte b/ts/graphs/GraphsPage.svelte
index 2c52979e6..e60c8b67f 100644
--- a/ts/graphs/GraphsPage.svelte
+++ b/ts/graphs/GraphsPage.svelte
@@ -60,9 +60,6 @@
         }
     }
 
-    .no-focus-outline:focus {
-        outline: 0;
-    }
 </style>
 
 <div class="base">
@@ -77,17 +74,15 @@
     {/if}
 
     {#if sourceData}
-        <div tabindex="-1" class="no-focus-outline">
-            {#each graphs as graph}
-                <svelte:component
-                    this={graph}
-                    {sourceData}
-                    {preferences}
-                    {revlogRange}
-                    {i18n}
-                    {nightMode}
-                    on:search={browserSearch} />
-            {/each}
-        </div>
+        {#each graphs as graph}
+            <svelte:component
+                this={graph}
+                {sourceData}
+                {preferences}
+                {revlogRange}
+                {i18n}
+                {nightMode}
+                on:search={browserSearch} />
+        {/each}
     {/if}
 </div>