diff --git a/frontend/apps/reader/modules/readerhyphenation.lua b/frontend/apps/reader/modules/readerhyphenation.lua
index 20455dec5..718993d87 100644
--- a/frontend/apps/reader/modules/readerhyphenation.lua
+++ b/frontend/apps/reader/modules/readerhyphenation.lua
@@ -33,6 +33,7 @@ function ReaderHyphenation:init()
                 })
                 self:_changeSel(k)
                 cre.setHyphDictionary(v)
+                self.ui.toc:onUpdateToc()
             end
         })
     end
diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua
index 020cbf618..747ec47a8 100644
--- a/frontend/apps/reader/modules/readerrolling.lua
+++ b/frontend/apps/reader/modules/readerrolling.lua
@@ -370,6 +370,7 @@ end
 function ReaderRolling:onChangeScreenMode(mode)
     self.ui:handleEvent(Event:new("SetScreenMode", mode))
     self:onChangeViewMode()
+    self:onUpdatePos()
 end
 
 --[[
diff --git a/frontend/ui/device/screen.lua b/frontend/ui/device/screen.lua
index eb6fe6550..00c43b096 100644
--- a/frontend/ui/device/screen.lua
+++ b/frontend/ui/device/screen.lua
@@ -70,8 +70,12 @@ function Screen:init()
         function self:offsetX()
             if Screen.cur_rotation_mode == 0 then
                 return 6
-            else
+            elseif Screen.cur_rotation_mode == 1 then
                 return 12
+            elseif Screen.cur_rotation_mode == 2 then
+                return 12
+            elseif Screen.cur_rotation_mode == 3 then
+                return 6
             end
         end
         function self:offsetY()
diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
index 8388c7632..37ae83f4c 100644
--- a/frontend/ui/uimanager.lua
+++ b/frontend/ui/uimanager.lua
@@ -61,9 +61,6 @@ local UIManager = {
 function UIManager:init()
     -- For the Kobo Aura an offset is needed, because the bezel make the
     -- visible screen smaller.
-    
-    function self:offsetX() return Screen:offsetX() end
-    function self:offsetY() return Screen:offsetY() end
 
     self.event_handlers = {
         __default__ = function(input_event)
@@ -319,8 +316,8 @@ function UIManager:run()
         for _, widget in ipairs(self._window_stack) do
             if self.repaint_all or self._dirty[widget.widget] then
                 widget.widget:paintTo(Screen.bb,
-                                      widget.x + UIManager:offsetX(),
-                                      widget.y + UIManager:offsetY())
+                                      widget.x + Screen:offsetX(),
+                                      widget.y + Screen:offsetY())
                 if self._dirty[widget.widget] == "auto" then
                     request_full_refresh = true
                 end