diff --git a/pdfreader.lua b/pdfreader.lua
index 49ed164bf..5b700fdaa 100644
--- a/pdfreader.lua
+++ b/pdfreader.lua
@@ -453,11 +453,17 @@ function PDFReader:inputloop()
 					if self.offset_x > 0 then
 						self.offset_x = 0
 					end
+					if self.pan_by_page then
+						self.offset_y = 0
+					end
 				elseif ev.code == KEY_FW_RIGHT then
 					self.offset_x = self.offset_x - x
 					if self.offset_x < self.min_offset_x then
 						self.offset_x = self.min_offset_x
 					end
+					if self.pan_by_page then
+						self.offset_y = 0
+					end
 				elseif ev.code == KEY_FW_UP then
 					self.offset_y = self.offset_y + y
 					if self.offset_y > 0 then