diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 7ca6b58b4e..925c0258ca 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1447,8 +1447,8 @@ Row const & TextMetrics::getPitAndRowNearY(int & y, pit_type & pit,
 		if (yy + rit->height() > y)
 			break;
 
-	if (assert_in_view && yy + rit->height() != y) {
-		if (!up) {
+	if (assert_in_view) {
+		if (!up && yy + rit->height() > y) {
 			if (rit != pm.rows().begin()) {
 				y = yy;
 				--rit;
@@ -1460,7 +1460,7 @@ Row const & TextMetrics::getPitAndRowNearY(int & y, pit_type & pit,
 				--rit;
 				y = yy;
 			}
-		} else  {
+		} else if (up && yy != y) {
 			if (rit != rlast) {
 				y = yy + rit->height();
 				++rit;
diff --git a/status.16x b/status.16x
index dd253d476a..245eaafd2e 100644
--- a/status.16x
+++ b/status.16x
@@ -313,6 +313,8 @@ What's new
 - In the Linguistics module, do not switch to the buffer language in
   glosses (this was only a cosmetic issue in the LyX window).
 
+- Allow PgUp and PgDown to position the cursor on the first or last row.
+
 
 * DOCUMENTATION AND LOCALIZATION