diff --git a/frontend/ui/reader/readerflip.lua b/frontend/ui/reader/readerflip.lua
index 9331b3f7c..7a483b3b9 100644
--- a/frontend/ui/reader/readerflip.lua
+++ b/frontend/ui/reader/readerflip.lua
@@ -1,5 +1,7 @@
 
-ReaderFlipping = LeftContainer:new{}
+ReaderFlipping = LeftContainer:new{
+	orig_reflow_mode = 0,
+}
 
 function ReaderFlipping:init()
 	local widget = ImageWidget:new{
@@ -10,7 +12,12 @@ function ReaderFlipping:init()
 	self[1] = widget
 end
 
-function ReaderFlipping:onSetDogearVisibility(visible)
-	self.view.dogear_visible = visible
+function ReaderFlipping:onSetFlippingMode(flipping_mode)
+	if flipping_mode then
+		self.orig_reflow_mode = self.view.document.configurable.text_wrap
+		self.view.document.configurable.text_wrap = 0
+	else
+		self.view.document.configurable.text_wrap = self.orig_reflow_mode
+	end
 	return true
 end
\ No newline at end of file
diff --git a/frontend/ui/reader/readerpaging.lua b/frontend/ui/reader/readerpaging.lua
index 4e63bf420..86918e908 100644
--- a/frontend/ui/reader/readerpaging.lua
+++ b/frontend/ui/reader/readerpaging.lua
@@ -155,6 +155,7 @@ function ReaderPaging:onToggleFlipping()
 	else
 		self:updateOriginalPage(nil)
 	end
+	self.ui:handleEvent(Event:new("SetFlippingMode", self.flipping_mode))
 	self.ui:handleEvent(Event:new("SetHinting", not self.flipping_mode))
 	UIManager:setDirty(self.view.dialog, "partial")
 end