diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9a3299b5c..f56b75d18 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -96,6 +96,7 @@ Araceli Yanez <github.com/aracelix>
 Sam Bradshaw <samjr.bradshaw@gmail.com>
 gnnoh <gerongfenh@gmail.com>
 Sachin Govind <sachin.govind.too@gmail.com>
+Bruce Harris <github.com/bruceharris>
 Patric Cunha <patricc@agap2.pt>
 Brayan Oliveira <github.com/BrayanDSO>
 
diff --git a/ftl/core/deck-config.ftl b/ftl/core/deck-config.ftl
index a843da1e2..d10ab8ae3 100644
--- a/ftl/core/deck-config.ftl
+++ b/ftl/core/deck-config.ftl
@@ -265,6 +265,7 @@ deck-config-reviews-too-low =
 deck-config-learning-step-above-graduating-interval = The graduating interval should be at least as long as your final learning step.
 deck-config-good-above-easy = The easy interval should be at least as long as the graduating interval.
 deck-config-relearning-steps-above-minimum-interval = The minimum lapse interval should be at least as long as your final relearning step.
+deck-config-maximum-answer-secs-above-recommended = Anki can schedule your reviews more efficiently when you keep each question short.
 
 ## Selecting a deck
 
diff --git a/ts/deck-options/TimerOptions.svelte b/ts/deck-options/TimerOptions.svelte
index e86735558..920d1dfa2 100644
--- a/ts/deck-options/TimerOptions.svelte
+++ b/ts/deck-options/TimerOptions.svelte
@@ -10,12 +10,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import SwitchRow from "./SwitchRow.svelte";
     import TitledContainer from "./TitledContainer.svelte";
+    import Warning from "./Warning.svelte";
 
     export let state: DeckOptionsState;
     export let api: Record<string, never>;
 
     const config = state.currentConfig;
     const defaults = state.defaults;
+
+    $: maximumAnswerSecondsAboveRecommended =
+        $config.capAnswerTimeToSecs > 600
+            ? tr.deckConfigMaximumAnswerSecsAboveRecommended()
+            : "";
 </script>
 
 <TitledContainer title={tr.deckConfigTimerTitle()}>
@@ -25,13 +31,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 bind:value={$config.capAnswerTimeToSecs}
                 defaultValue={defaults.capAnswerTimeToSecs}
                 min={30}
-                max={600}
+                max={7200}
                 markdownTooltip={tr.deckConfigMaximumAnswerSecsTooltip()}
             >
                 {tr.deckConfigMaximumAnswerSecs()}
             </SpinBoxRow>
         </Item>
 
+        <Item>
+            <Warning warning={maximumAnswerSecondsAboveRecommended} />
+        </Item>
+
         <Item>
             <!-- AnkiMobile hides this -->
             <div class="show-timer-switch" style="display: contents;">