diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 19a9b605e..afea61716 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -91,6 +91,7 @@ if(e_MENUMANAGER_ACTIVE === false )
 		    transition: fadeIn .4s;
 		}
 
+		iframe#menu_iframe { overflow-x:hidden; width: 100%; height: 90vh; border-width: 3px; padding:0 }
 
 			.menu-selector ul li {
 				background-color: rgba(255,255,255,0.1);
@@ -110,6 +111,13 @@ if(e_MENUMANAGER_ACTIVE === false )
 				.menu-selector { height:550px }
 			}
 
+			@media all and (max-height: 800px) {
+
+				.menu-selector { height:250px }
+				iframe#menu_iframe { height: 87vh }
+				.menu-selector ul li { font-size: 0.8em }
+			}
+
 			ul.dropdown-menu.e-mm-selector { padding: 10px; margin-top: -2px; margin-right:-2px; }
 
 		");
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index c337570c4..b52b44415 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -206,7 +206,7 @@ class e_menuManager {
 	//	$cnt = $sql->select("menus", "*", "menu_location > 0 AND menu_layout = '$curLayout' ORDER BY menu_name "); // calculate height to remove vertical scroll-bar.
 
 	//	$text = "<object class='well' type='text/html' id='menu_iframe' data='".$url."' width='100%' style='overflow:auto;width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' ></object>";
-		$text = "<iframe class='well' id='menu_iframe' name='e-mm-iframe' src='".$url."' width='100'  style='overflow-x:hidden; width: 100%; height: 90vh; border-width: 3px; padding:0' ></iframe>";
+		$text = "<iframe class='well' id='menu_iframe' name='e-mm-iframe' src='".$url."' width='100'   ></iframe>";
 	
 		return $text;
 	}