diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 709386c4..e6802474 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -795,3 +795,7 @@ Rene Bartsch <ml@bartschnet.de>
 Christoph Hermanns <christoph.hermanns@gmx.de>
  for reporting a bug in handling the "Red" button in the "Schedules" menu in case
  there are no events listed for a particular channel
+
+Oskar Signell <oskar@signell.net>
+ for pointing out a problem with setting an editing mark while in "Pause" mode,
+ where replay was not immediately positioned to the marked frame
diff --git a/HISTORY b/HISTORY
index 2d181157..17513b02 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2369,3 +2369,6 @@ Video Disk Recorder Revision History
 - Fixed handling the "Red" button in the "Schedules" menu in case there are no
   events listed for a particular channel (thanks to Christoph Hermanns for
   reporting this one).
+- When setting an editing mark while in "Pause" mode, replay now immediately
+  jumps to the marked frame (thanks to Oskar Signell for pointing out this
+  problem).
diff --git a/menu.c b/menu.c
index c23c1e38..54c07900 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.270 2003/09/05 13:30:02 kls Exp $
+ * $Id: menu.c 1.271 2003/09/06 10:26:45 kls Exp $
  */
 
 #include "menu.h"
@@ -3531,6 +3531,10 @@ void cReplayControl::MarkToggle(void)
      else {
         marks.Add(Current);
         ShowTimed(2);
+        bool Play, Forward;
+        int Speed;
+        if (GetReplayMode(Play, Forward, Speed) && !Play)
+           Goto(Current, true);
         }
      marks.Save();
      }
@@ -3659,7 +3663,6 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
       DoShowMode = false;
       switch (Key) {
         // Editing:
-        //XXX should we do this only when the ProgressDisplay is on???
         case kMarkToggle:      MarkToggle(); break;
         case kMarkJumpBack:    MarkJump(false); break;
         case kMarkJumpForward: MarkJump(true); break;