diff --git a/frontend/ui/widget/textviewer.lua b/frontend/ui/widget/textviewer.lua
index 7884134ec..00dcebc69 100644
--- a/frontend/ui/widget/textviewer.lua
+++ b/frontend/ui/widget/textviewer.lua
@@ -14,7 +14,7 @@ local InputContainer = require("ui/widget/container/inputcontainer")
 local LineWidget = require("ui/widget/linewidget")
 local OverlapGroup = require("ui/widget/overlapgroup")
 local ScrollTextWidget = require("ui/widget/scrolltextwidget")
-local TextWidget = require("ui/widget/textwidget")
+local TextBoxWidget = require("ui/widget/textboxwidget")
 local UIManager = require("ui/uimanager")
 local VerticalGroup = require("ui/widget/verticalgroup")
 local WidgetContainer = require("ui/widget/container/widgetcontainer")
@@ -80,11 +80,12 @@ function TextViewer:init()
         }
     end
 
-    local title_text = TextWidget:new{
+    local closeb = CloseButton:new{ window = self, }
+    local title_text = TextBoxWidget:new{
         text = self.title,
         face = self.title_face,
         bold = true,
-        width = self.width - 2*self.title_padding - 2*self.title_margin,
+        width = self.width - 2*self.title_padding - 2*self.title_margin - closeb:getSize().w,
     }
     local titlew = FrameContainer:new{
         padding = self.title_padding,
@@ -104,7 +105,7 @@ function TextViewer:init()
             h = titlew:getSize().h
         },
         titlew,
-        CloseButton:new{ window = self, },
+        closeb,
     }
 
     local separator = LineWidget:new{