diff --git a/src/ChangeLog b/src/ChangeLog
index 01b9fdffd..28a491aca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,8 @@
 	condition for breaking out of the loop when upto == 0.
 	* view.c (display): Fixed operator precedence with ?: in hex
 	display.
+	* view.c (view_move_forward2): Fixed a bug related to the return
+	value, which had made the down and page-down keys no-ops.
 
 2005-04-19  Roland Illig  <roland.illig@gmx.de>
 
diff --git a/src/view.c b/src/view.c
index 35c8e9daa..83426eaac 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1273,10 +1273,8 @@ view_move_forward2 (WView *view, offset_type current, int lines, offset_type upt
 	    } else if (c == '\n')
 		line++;
 	}
-	if (upto)
-	    return line;
+	return (upto) ? line : p;
     }
-    return current;
 }
 
 /* special case for text (non-hex) mode with line wrapping. */