diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index aa74d116..53a3cd13 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1612,6 +1612,8 @@ Andreas Brugger <brougs78@gmx.net>
  it in a context sensitive manner
  for reporting a loss of the date display in the "classic" skin's main menu
  for reporting a missing setting of lastFreeMB in cMenuMain::Update()
+ for suggesting to ignore "repeat" and "release" keys in the time search entry mode
+ during replay, to avoid inadvertently leaving it in case a key is pressed too long
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
diff --git a/HISTORY b/HISTORY
index d68b52e8..ab48e9a4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5594,3 +5594,6 @@ Video Disk Recorder Revision History
 - Speeded up anti-aliased font rendering by caching the blend indexes (based on
   a suggestion by Martin Wache).
 - Fixed setting the OSD area in the pictures plugin.
+- Ignoring "repeat" and "release" keys in the time search entry mode during replay,
+  to avoid inadvertently leaving it in case a key is pressed too long (suggested
+  by Andreas Brugger).
diff --git a/menu.c b/menu.c
index 62545cfe..05aeff0a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.471 2008/02/08 13:48:31 kls Exp $
+ * $Id: menu.c 1.472 2008/02/09 12:24:24 kls Exp $
  */
 
 #include "menu.h"
@@ -4243,7 +4243,8 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
          timeSearchActive = false;
          break;
     default:
-         timeSearchActive = false;
+         if (!(Key & k_Flags)) // ignore repeat/release keys
+            timeSearchActive = false;
          break;
     }