@@ -7,7 +7,6 @@ import { PageSettings } from './modules/page_settings.js';
 import { crossFramingProtection } from './modules/cross_framing_protection.js';
 import { Indexes } from './modules/indexes.js';
 import { Config } from './modules/config.js';
-import { initializeMenuResizer } from './modules/menu-resizer.js';
 
 AJAX.registerOnload('main.js', () => AJAX.removeSubmitEvents());
 $(AJAX.loadEventHandler());
@@ -34,7 +33,7 @@ AJAX.registerTeardown('main.js', Functions.off());
 AJAX.registerOnload('main.js', Functions.on());
 
 $(Functions.dismissNotifications());
-$(initializeMenuResizer());
+$(Functions.initializeMenuResizer());
 $(Functions.floatingMenuBar());
 $(Functions.breadcrumbScrollToTop());
 
 
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { Functions } from './functions.js';
+import { Functions } from './modules/functions.js';
 
 /**
  * Handles the resizing of a menu according to the available screen width
@@ -189,33 +189,3 @@ import { Functions } from './functions.js';
         }
     };
 }($));
-
-/**
- * @return {void}
- */
-function resizeTopMenu () {
-    $('#topmenu').menuResizer('resize');
-}
-
-/**
- * @return {void}
- */
-function initializeTopMenuResizer () {
-    $('#topmenu').menuResizer(() => $(document.body).width() - 5);
-}
-
-/**
- * @return {function}
- */
-function initializeMenuResizer () {
-    return function () {
-        // Initialise the menu resize plugin
-        initializeTopMenuResizer();
-        // register resize event
-        $(window).on('resize', function () {
-            resizeTopMenu();
-        });
-    };
-}
-
-export { initializeMenuResizer, initializeTopMenuResizer, resizeTopMenu };
@@ -2,7 +2,6 @@ import $ from 'jquery';
 import { Functions } from './functions.js';
 import { Navigation } from './navigation.js';
 import { CommonParams } from './common.js';
-import { initializeTopMenuResizer } from './menu-resizer.js';
 import highlightSql from './sql-highlight.js';
 
 /**
@@ -223,7 +222,7 @@ const AJAX = {
                 // Remove duplicate wrapper
                 // TODO: don't send it in the response
                 .children().first().remove();
-            initializeTopMenuResizer();
+            $('#topmenu').menuResizer(Functions.mainMenuResizerCallback);
         }
     },
     /**
 
@@ -4,7 +4,6 @@ import { Navigation } from './navigation.js';
 import { CommonActions, CommonParams } from './common.js';
 import { Indexes } from './indexes.js';
 import { Config } from './config.js';
-import { resizeTopMenu } from './menu-resizer.js';
 import tooltip from './tooltip.js';
 import highlightSql from './sql-highlight.js';
 
@@ -3166,6 +3165,24 @@ Functions.showHints = function ($div) {
     });
 };
 
+Functions.mainMenuResizerCallback = function () {
+    // 5 px margin for jumping menu in Chrome
+    // eslint-disable-next-line compat/compat
+    return $(document.body).width() - 5;
+};
+
+/**
+ * @return {function}
+ */
+Functions.initializeMenuResizer = () => function () {
+    // Initialise the menu resize plugin
+    $('#topmenu').menuResizer(Functions.mainMenuResizerCallback);
+    // register resize event
+    $(window).on('resize', function () {
+        $('#topmenu').menuResizer('resize');
+    });
+};
+
 /**
  * var  toggleButton  This is a function that creates a toggle
  *                    sliding button given a jQuery reference
@@ -3688,7 +3705,7 @@ Functions.floatingMenuBar = () => function () {
                 'padding-top',
                 $('#floating_menubar').outerHeight(true)
             );
-            resizeTopMenu();
+            $('#topmenu').menuResizer('resize');
         }, 4);
     }
 };
 
@@ -2,7 +2,6 @@ import $ from 'jquery';
 import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 import { Config } from './config.js';
-import { resizeTopMenu } from './menu-resizer.js';
 import tooltip from './tooltip.js';
 
 /**
@@ -1195,7 +1194,7 @@ Navigation.ResizeHandler = function () {
     this.mouseup = function (event) {
         $('body').css('cursor', '');
         Functions.configSet('NavigationWidth', event.data.resize_handler.getPos(event));
-        resizeTopMenu();
+        $('#topmenu').menuResizer('resize');
         $(document)
             .off('mousemove')
             .off('mouseup');
@@ -1282,7 +1281,7 @@ Navigation.ResizeHandler = function () {
         this.treeResize();
         const callbackSuccessGetConfigValue = (data) => {
             this.setWidth(data);
-            resizeTopMenu();
+            $('#topmenu').menuResizer('resize');
         };
         // Skip mobile
         if (isLoadedOnMobile === false) {
 
@@ -140,6 +140,7 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
         $this->scripts->addFile('index.php', ['route' => '/messages', 'l' => $GLOBALS['lang']]);
         $this->scripts->addFile('shared.js');
+        $this->scripts->addFile('menu_resizer.js');
         $this->scripts->addFile('main.js');
 
         $this->scripts->addCode($this->getJsParamsCode());
 
@@ -262,6 +262,7 @@ public function testAddedDefaultScripts(): void
             ['name' => 'vendor/jquery/jquery-ui-timepicker-addon.js', 'fire' => 0],
             ['name' => 'index.php', 'fire' => 0],
             ['name' => 'shared.js', 'fire' => 0],
+            ['name' => 'menu_resizer.js', 'fire' => 1],
             ['name' => 'main.js', 'fire' => 1],
         ];
         $this->assertSame($expected, $scripts->getFiles());
 
@@ -43,6 +43,7 @@ module.exports = [
             'jquery.sortable-table': './js/src/jquery.sortable-table.js',
             'main': './js/src/main.js',
             'makegrid': './js/src/makegrid.js',
+            'menu_resizer': './js/src/menu_resizer.js',
             'multi_column_sort': './js/src/multi_column_sort.js',
             'name-conflict-fixes': './js/src/name-conflict-fixes.js',
             'normalization': './js/src/normalization.js',