diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b21608a55a9..817c7cae698 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2472,8 +2472,14 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 				console.log("Click on .butAction.dropdown-toggle");
 				var parentholder = jQuery(".butAction.dropdown-toggle").closest(".dropdown");
             	var offset = parentholder.offset();
+				var widthdocument = $(document).width();
 				var left = offset.left;
-				var right = $(document).width() - offset.left - parentholder.width();
+				var right = widthdocument - offset.left - parentholder.width();
+				var widthpopup = parentholder.children(".dropdown-content").width();
+				console.log("left="+left+" right="+right+" width="+widthpopup+" widthdocument="+widthdocument);
+				if (widthpopup + right >= widthdocument) {
+					right = 10;
+				}
 	            parentholder.toggleClass("open");
 	            parentholder.children(".dropdown-content").css({"right": right+"px", "left": "auto"});
 	        });
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 310d2899a37..6c88f652ea8 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6546,7 +6546,7 @@ span#select2-boxbookmark-container {
 	font-weight: normal;
 }
 .select2-container-multi-dolibarr .select2-choices-dolibarr li {
-  float: left;
+  float: <?php echo $left; ?>;
   list-style: none;
 }
 .select2-container-multi-dolibarr .select2-choices-dolibarr {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 25843c8c407..9a952827ffb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6453,7 +6453,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
 	font-weight: normal;
 }
 .select2-container-multi-dolibarr .select2-choices-dolibarr li {
-  float: left;
+  float: <?php echo $left; ?>;
   list-style: none;
 }
 .select2-container-multi-dolibarr .select2-choices-dolibarr {