diff --git a/assets/survey_themes/fruity_twentythree/core/old_core_theme.js b/assets/survey_themes/fruity_twentythree/core/old_core_theme.js
index 67cf09cc39..4d0731eceb 100644
--- a/assets/survey_themes/fruity_twentythree/core/old_core_theme.js
+++ b/assets/survey_themes/fruity_twentythree/core/old_core_theme.js
@@ -21,9 +21,13 @@ export var ThemeScripts = function () {
     /**
      * fix padding of body according to navbar-fixed-top
      * in endpage and in $(window).resize
+     * also fix the max height for the dropdown menu as it depends
+     * on the same value
      */
     var fixBodyPadding = function fixBodyPadding() {
-        $('body').css('padding-top', Math.round($('#survey-nav').outerHeight()) + 'px');
+        var navHeightPx = Math.round($('#survey-nav').outerHeight());
+        $('body').css('padding-top', navHeightPx + 'px');
+        $('#main-dropdown').css('max-height', 'calc(100vh - ' + navHeightPx + 'px)');
     };
 
     /**
diff --git a/assets/survey_themes/fruity_twentythree/navbar/navbar.scss b/assets/survey_themes/fruity_twentythree/navbar/navbar.scss
index f69ed541a4..7ff9d279b3 100644
--- a/assets/survey_themes/fruity_twentythree/navbar/navbar.scss
+++ b/assets/survey_themes/fruity_twentythree/navbar/navbar.scss
@@ -117,6 +117,9 @@ Responsive navbar-brand image CSS
 
     #main-dropdown {
         min-width: 250px;
+        max-width: 100vw;
+        overflow-x: auto;
+        overflow-y: auto;
     }
     .dropdown-header {
         font-weight : $font-weight-500;