From de19ff91bbea944ec1f7beab31b93f22ff6555ad Mon Sep 17 00:00:00 2001
From: Jack <jack@monkeytype.com>
Date: Thu, 9 Apr 2026 21:28:54 +0200
Subject: [PATCH 1/2] fix: hotkey issues (@miodec) (#7802)

---
 frontend/src/ts/input/hotkeys/quickrestart.ts |  9 +++++++--
 frontend/src/ts/states/hotkeys.ts             | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/frontend/src/ts/input/hotkeys/quickrestart.ts b/frontend/src/ts/input/hotkeys/quickrestart.ts
index 4cd26a4c7b68..1b25dbc22179 100644
--- a/frontend/src/ts/input/hotkeys/quickrestart.ts
+++ b/frontend/src/ts/input/hotkeys/quickrestart.ts
@@ -6,7 +6,7 @@ import { getActivePage } from "../../states/core";
 import { hotkeys, quickRestartHotkeyMap } from "../../states/hotkeys";
 import { createHotkey } from "./utils";
 import { getConfig } from "../../config/store";
-import { isLongTest } from "../../states/test";
+import { isLongTest, wordsHaveNewline, wordsHaveTab } from "../../states/test";
 
 function quickRestart(e: KeyboardEvent): void {
   if (isAnyPopupVisible()) {
@@ -37,5 +37,10 @@ createHotkey(
 createHotkey(
   () => quickRestartHotkeyMap[getConfig.quickRestart],
   quickRestart,
-  () => ({ enabled: isLongTest() }),
+  () => ({
+    enabled:
+      isLongTest() &&
+      !(wordsHaveTab() && getConfig.quickRestart === "tab") &&
+      !(wordsHaveNewline() && getConfig.quickRestart === "enter"),
+  }),
 );
diff --git a/frontend/src/ts/states/hotkeys.ts b/frontend/src/ts/states/hotkeys.ts
index b5356a73374e..61ac0103f535 100644
--- a/frontend/src/ts/states/hotkeys.ts
+++ b/frontend/src/ts/states/hotkeys.ts
@@ -28,14 +28,26 @@ createEffect(() => {
 
 function updateHotkeys(): Hotkeys {
   const isOnTestPage = getActivePage() === "test";
+
+  const quickRestartIsTab = getConfig.quickRestart === "tab";
+  const quickRestartIsEnter = getConfig.quickRestart === "enter";
+  // const quickRestartIsEsc = getConfig.quickRestart === "esc";
+
+  const commandlineIsTab = getConfig.quickRestart === "esc";
+  // const commandlineIsEsc = getConfig.quickRestart !== "esc";
+
   return {
     quickRestart: shiftHotkey(
       quickRestartHotkeyMap[getConfig.quickRestart],
-      isOnTestPage && (wordsHaveTab() || isLongTest()),
+      isOnTestPage &&
+        ((wordsHaveTab() && quickRestartIsTab) ||
+          ((wordsHaveNewline() || getConfig.funbox.includes("58008")) &&
+            quickRestartIsEnter) ||
+          isLongTest()),
     ),
     commandline: shiftHotkey(
-      getConfig.quickRestart === "esc" ? "Tab" : "Escape",
-      isOnTestPage && wordsHaveNewline(),
+      commandlineIsTab ? "Tab" : "Escape",
+      isOnTestPage && wordsHaveTab() && commandlineIsTab,
     ),
   };
 }

From a8875f860f042288063db6a1174beaaa32e47549 Mon Sep 17 00:00:00 2001
From: Miodec <jack@monkeytype.com>
Date: Thu, 9 Apr 2026 22:41:51 +0200
Subject: [PATCH 2/2] fix(background filters): blur shifting the image to the
 left

---
 frontend/src/ts/elements/custom-background-filter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/ts/elements/custom-background-filter.ts b/frontend/src/ts/elements/custom-background-filter.ts
index 72663886bee9..b335933e7893 100644
--- a/frontend/src/ts/elements/custom-background-filter.ts
+++ b/frontend/src/ts/elements/custom-background-filter.ts
@@ -46,8 +46,8 @@ export function apply(): void {
     filter: filterCSS,
     width: `calc(100% + ${filters.blur.value * 4}rem)`,
     height: `calc(100% + ${filters.blur.value * 4}rem)`,
-    left: `-${filters.blur.value * 2}rem`,
-    top: `-${filters.blur.value * 2}rem`,
+    // left: `-${filters.blur.value * 2}rem`,
+    // top: `-${filters.blur.value * 2}rem`,
     position: "absolute",
   };
   qs(".customBackground img")?.setStyle(css);