diff --git a/src/lib/components/fitness/WorkoutFab.svelte b/src/lib/components/fitness/WorkoutFab.svelte
index a2d46cf..6ea59d6 100644
--- a/src/lib/components/fitness/WorkoutFab.svelte
+++ b/src/lib/components/fitness/WorkoutFab.svelte
@@ -30,6 +30,7 @@ const restProgress = $derived(restTotal > 0 ? restSeconds / restTotal : 0);
{#if restTotal > 0 && restSeconds > 0}
+
e.stopPropagation()}>
diff --git a/src/routes/fitness/[stats=fitnessStats]/+page.svelte b/src/routes/fitness/[stats=fitnessStats]/+page.svelte
index 1dea8a1..a1ef92b 100644
--- a/src/routes/fitness/[stats=fitnessStats]/+page.svelte
+++ b/src/routes/fitness/[stats=fitnessStats]/+page.svelte
@@ -159,8 +159,9 @@
{#if goalEditing}
-
{ if (e.key === 'Escape') goalEditing = false; }} role="dialog">
-
goalEditing = false}>
+
+
{ if (e.key === 'Escape') goalEditing = false; }} role="dialog" tabindex="-1">
+
goalEditing = false} onkeydown={(e) => { if (e.key === 'Escape') goalEditing = false; }} role="presentation">
{t('weekly_goal', lang)}
diff --git a/src/routes/fitness/[workout=fitnessWorkout]/[active=fitnessActive]/+page.svelte b/src/routes/fitness/[workout=fitnessWorkout]/[active=fitnessActive]/+page.svelte
index 198b00e..f13ef27 100644
--- a/src/routes/fitness/[workout=fitnessWorkout]/[active=fitnessActive]/+page.svelte
+++ b/src/routes/fitness/[workout=fitnessWorkout]/[active=fitnessActive]/+page.svelte
@@ -90,7 +90,7 @@
}
}
- let gpsToggling = false;
+ let gpsToggling = $state(false);
async function toggleGps() {
if (gpsToggling) return;
gpsToggling = true;