diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua
index f32286660..d84bcf08b 100644
--- a/frontend/ui/elements/filemanager_menu_order.lua
+++ b/frontend/ui/elements/filemanager_menu_order.lua
@@ -31,7 +31,9 @@ local order = {
         "evernote",
         "goodreads",
         "keep_alive",
+        "frontlight_gesture_controller",
         "statistics",
+        "battery_statistics",
         "storage_stat",
         "cloud_storage",
         "----------------------------",
diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua
index 46e15f133..151875e6c 100644
--- a/frontend/ui/elements/reader_menu_order.lua
+++ b/frontend/ui/elements/reader_menu_order.lua
@@ -46,7 +46,9 @@ local order = {
         "evernote",
         "goodreads",
         "keep_alive",
+        "frontlight_gesture_controller",
         "statistics",
+        "battery_statistics",
         "storage_stat",
         "speed_reading_module_perception_expander",
         "synchronize_time",
diff --git a/plugins/batterystat.koplugin/main.lua b/plugins/batterystat.koplugin/main.lua
index d8217835a..59d4bddf2 100644
--- a/plugins/batterystat.koplugin/main.lua
+++ b/plugins/batterystat.koplugin/main.lua
@@ -251,8 +251,8 @@ function BatteryStatWidget:init()
     self.ui.menu:registerToMainMenu(self)
 end
 
-function BatteryStatWidget:addToMainMenu(tab_item_table)
-    table.insert(tab_item_table.plugins, {
+function BatteryStatWidget:addToMainMenu(menu_items)
+    menu_items.battery_statistics = {
         text = _("Battery statistics"),
         callback = function()
             BatteryStat:onCallback()
diff --git a/plugins/kobolight.koplugin/main.lua b/plugins/kobolight.koplugin/main.lua
index 0b5284674..adadce64e 100644
--- a/plugins/kobolight.koplugin/main.lua
+++ b/plugins/kobolight.koplugin/main.lua
@@ -159,8 +159,8 @@ function KoboLight:onSwipe(_, ges)
     return true
 end
 
-function KoboLight:addToMainMenu(tab_item_table)
-    table.insert(tab_item_table.plugins, {
+function KoboLight:addToMainMenu(menu_items)
+    menu_items.frontlight_gesture_controller = {
         text = _("Frontlight gesture controller"),
         callback = function()
             local image = ImageWidget:new{