diff --git a/api/js/etemplate/et2_widget_toolbar.js b/api/js/etemplate/et2_widget_toolbar.js
index 78be2a1519..46c84ace63 100644
--- a/api/js/etemplate/et2_widget_toolbar.js
+++ b/api/js/etemplate/et2_widget_toolbar.js
@@ -439,6 +439,14 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
 			},
 			beforeActivate: function ()
 			{
+				if (egwIsMobile())
+				{
+					menulist.height(screen.availHeight - 50);
+				}
+				else
+				{
+					menulist.css({height:'inherit'})
+				}
 				// Nothing to show in menulist
 				if (menulist.children().length == 0)	return false;
 			}
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 24ea70560e..6dedac3df7 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2066,7 +2066,7 @@ div.ui-dialog div.ui-dialog-content > div[id] {
 }
 div.ui-toolbar-menulist{
 	position: absolute;
-	height: inherit !important;
+	height: inherit;
 	z-index: 999 !important;
 	overflow: hidden !important;
 	border: solid black 1px;
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 3790f041f5..08e1bac7bf 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -924,7 +924,7 @@
   }
   div.ui-toolbar-menulist {
     position: absolute;
-    height: inherit !important;
+    height: inherit;
     z-index: 999 !important;
     overflow: hidden !important;
     border: solid black 1px;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index bc3b578b7f..8fb10a2c98 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -913,7 +913,7 @@
   }
   div.ui-toolbar-menulist {
     position: absolute;
-    height: inherit !important;
+    height: inherit;
     z-index: 999 !important;
     overflow: hidden !important;
     border: solid black 1px;
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index ea7cd8d880..72200e15e2 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -901,7 +901,7 @@ textarea.description {
 
 div.ui-toolbar-menulist{
 	position: absolute;
-	height: inherit !important;
+	height: inherit;
 	z-index: 999 !important;
 	overflow: hidden !important;
 	border: solid black 1px;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 166423edc8..837a5fcc67 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -935,7 +935,7 @@
   }
   div.ui-toolbar-menulist {
     position: absolute;
-    height: inherit !important;
+    height: inherit;
     z-index: 999 !important;
     overflow: hidden !important;
     border: solid black 1px;
@@ -7870,7 +7870,6 @@ form[id^="tracker-"] .dialogHeadbar {
   body div.et2_toolbar.et2_head_toolbar div.ui-toolbar-menulist {
     width: 100%;
     left: 0px;
-    height: 322px !important;
     overflow-y: auto !important;
     box-shadow: 2px 3px 13px #666666;
     -moz-box-shadow: 2px 3px 13px #666666;
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index 4660d7d762..1394d5c450 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -1012,7 +1012,6 @@
 				{
 					width: 100%;
 					left:0px;
-					height: 322px !important;
 					overflow-y: auto !important;
 					box-shadow: 2px 3px 13px #666666;
 					-moz-box-shadow: 2px 3px 13px #666666;