diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 11319df7..59f52997 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1425,3 +1425,7 @@ Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
 
 Klaus ??? <klaus@reel-multimedia.com>
  for reporting a race condition in cTransfer.
+
+Thomas Günther <tom1@toms-cafe.de>
+ for fixing handling the frame number display if '7' is pressed before the first
+ editing mark, or '9' after the last one
diff --git a/HISTORY b/HISTORY
index 749fc02d..a47af92d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3687,3 +3687,5 @@ Video Disk Recorder Revision History
   files created in that case).
 - Added some 'mkdir -p' to the Makefile's 'install' target.
 - Changed the title of the recording info menu (thanks to Rolf Ahrenberg).
+- Fixed handling the frame number display if '7' is pressed before the first editing
+  mark, or '9' after the last one (thanks to Thomas Günther).
diff --git a/menu.c b/menu.c
index 814caf86..fa541909 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.352 2005/08/14 12:02:08 kls Exp $
+ * $Id: menu.c 1.353 2005/08/14 12:57:48 kls Exp $
  */
 
 #include "menu.h"
@@ -3596,10 +3596,11 @@ void cReplayControl::MarkJump(bool Forward)
      int Current, Total;
      if (GetIndex(Current, Total)) {
         cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
-        if (m)
+        if (m) {
            Goto(m->position, true);
+           displayFrames = true;
+           }
         }
-     displayFrames = true;
      }
 }