diff --git a/zephyr/static/js/hotkey.js b/zephyr/static/js/hotkey.js
index ad24a5ea26..183d7bd2d7 100644
--- a/zephyr/static/js/hotkey.js
+++ b/zephyr/static/js/hotkey.js
@@ -53,9 +53,15 @@ function process_hotkey(code) {
     switch (code) {
     case 33: // Page Up
         keep_pointer_in_view();
+        if (at_top_of_viewport()) {
+            select_zephyr(get_first_visible(), false);
+        }
         return false; // We want the browser to actually page up and down
     case 34: // Page Down
         keep_pointer_in_view();
+        if (at_bottom_of_viewport()) {
+            select_zephyr(get_last_visible(), false);
+        }
         return false;
     case 27: // Esc: hide compose pane
         hide_compose();