diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua
index 4c53d2d17..3f2d7dfcd 100644
--- a/frontend/ui/widget/menu.lua
+++ b/frontend/ui/widget/menu.lua
@@ -872,12 +872,9 @@ function Menu:updateItems(select_number)
         end -- if i <= self.items
     end -- for c=1, self.perpage
     if self.item_group[1] then
-        if not Device:isTouchDevice() or Device:hasKeys() then
-            -- only draw underline for nontouch device
+        if Device:hasKeys() then
             -- reset focus manager accordingly
             self.selected = { x = 1, y = select_number }
-            -- set focus to requested menu item
-            self.item_group[select_number]:onFocus(true)
         end
         -- update page information
         self.page_info_text:setText(util.template(_("page %1 of %2"), self.page, self.page_num))
diff --git a/plugins/coverbrowser.koplugin/covermenu.lua b/plugins/coverbrowser.koplugin/covermenu.lua
index 8fdbc2c7e..a629e0741 100644
--- a/plugins/coverbrowser.koplugin/covermenu.lua
+++ b/plugins/coverbrowser.koplugin/covermenu.lua
@@ -1,6 +1,5 @@
 local Device = require("device")
 local DocumentRegistry = require("document/documentregistry")
-local Event = require("ui/event")
 local FileManagerBookInfo = require("apps/filemanager/filemanagerbookinfo")
 local ImageViewer = require("ui/widget/imageviewer")
 local Menu = require("ui/widget/menu")
@@ -89,15 +88,9 @@ function CoverMenu:updateItems(select_number)
 
     -- As done in Menu:updateItems()
     if self.item_group[1] then
-        if not Device:isTouchDevice() then
-            -- only draw underline for nontouch device
+        if Device:hasKeys() then
             -- reset focus manager accordingly
             self.selected = { x = 1, y = select_number }
-            -- set focus to requested menu item
-            self:getFocusItem():handleEvent(Event:new("Focus"))
-            -- This will not work with our MosaicMenu, as a MosaicMenuItem is
-            -- not a direct child of item_group (which contains VerticalSpans
-            -- and HorizontalGroup...)
         end
         -- update page information
         self.page_info_text:setText(util.template(_("page %1 of %2"), self.page, self.page_num))