diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 984b7cb2..bfbc863a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1465,3 +1465,6 @@ Hardy Flor <HFlor@web.de>
 
 Harald Milz <hm@seneca.muc.de>
  for his CUTR patch, which was used as a base to implement the SVDRP command EDIT
+
+Marko Mäkelä <marko.makela@hut.fi>
+ for making repeat keys be ignored when waiting for a keypress to cancel an operation
diff --git a/HISTORY b/HISTORY
index 4790adbb..5da8e8b5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3747,7 +3747,7 @@ Video Disk Recorder Revision History
 - The new SVDRP command EDIT can be used to start the editing process of a recording
   (based on the CUTR patch by Harald Milz).
 
-2005-09-02: Version 1.3.32
+2005-09-03: Version 1.3.32
 
 - Added some missing braces in remux.c (thanks to Wayne Keer for reporting this one).
 - Removed unused MAINMENUENTRY from svdrpdemo.c (thanks to Udo Richter for reporting
@@ -3771,3 +3771,5 @@ Video Disk Recorder Revision History
   by Malcolm Caldwell).
 - Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to
   Lauri Tischler).
+- Repeat keys are now ignored when waiting for a keypress to cancel an operation
+  (thanks to Marko Mäkelä).
diff --git a/interface.c b/interface.c
index 33737433..4f18ddda 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.68 2004/11/01 14:23:28 kls Exp $
+ * $Id: interface.c 1.69 2005/09/03 09:07:23 kls Exp $
  */
 
 #include "interface.h"
@@ -56,7 +56,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
   time_t timeout = time(NULL) + Seconds;
   for (;;) {
       Key = GetKey();
-      if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout || interrupted)
+      if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted)
          break;
       }
   if (KeepChar && ISRAWKEY(Key))