diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4a39269c23e..9b8b6fcbcc3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -745,7 +745,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 		else
 			$isactive=false;
 
-		if ($i <= $limittoshow || $isactive )
+		if ($i <= $limittoshow || $isactive)
 		{
 			$out.='<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((! $isactive && ! empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT))?' hideonprint':'').'"><!-- id tab = '.(empty($links[$i][2])?'':$links[$i][2]).' -->';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
@@ -775,7 +775,13 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 		}
 		else
 		{
-			$outmore.='<div class="" style="display:inherit; background-color:#f9f9f9; padding-top:5px; padding-right:15px; padding-left:12px;">';
+		    // The popup with the other tabs
+			if (! $popuptab) 
+			{
+			    $popuptab=1;
+			    $outmore.='<div class="popuptabset">';
+			}
+		    $outmore.='<div class="popuptab" style="display:inherit;">';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
 				if (!empty($links[$i][0]))
@@ -788,16 +794,18 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 				$outmore.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 
 			$outmore.='</div>';
+			
 			$nbintab++;
 		}
 		$displaytab=$i;
 	}
-
+	if ($popuptab) $outmore.='</div>';
+	
 	if ($displaytab > $limittoshow)
 	{
 		$tabsname=str_replace("@", "", $picto);
 		$out.='<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out.='<a href="" data-role="button" style="background-color: #f0f0f0;" class="tab inline-block">'.$langs->trans("More").' <span class="badge">'.$nbintab.'</span></a>';
+		$out.='<a href="#" data-role="button" class="tab moretab inline-block">'.$langs->trans("More").'... ('.$nbintab.')</a>';
 		$out.='<div id="moretabsList'.$tabsname.'" style="position: absolute; left: -999em;text-align: left;margin:0px;padding:2px">'.$outmore.'</div>';
 		$out.="</div>\n";
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6067b9b4aa8..6b3f5c662a3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1571,7 +1571,16 @@ div.tabBar {
     box-shadow: 3px 3px 4px #DDD;
 	<?php } ?>
 }
-
+div.popuptabset {
+	padding: 6px;
+	border: 1px solid #888;
+}
+div.popuptab {
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+}
 div.tabsAction {
     margin: 20px 0em 10px 0em;
     padding: 0em 0em;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a34397c8bfe..c01d0198e0b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1549,7 +1549,16 @@ div.tabsAction {
     padding: 0em 0em;
     text-align: right;
 }
-
+div.popuptabset {
+	padding: 6px;
+	border: 1px solid #888;
+}
+div.popuptab {
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+}
 
 a.tabTitle {
 /*    background: #657090;