diff --git a/etemplate/js/et2_widget_tabs.js b/etemplate/js/et2_widget_tabs.js
index ac09b60d9e..494bb0e271 100644
--- a/etemplate/js/et2_widget_tabs.js
+++ b/etemplate/js/et2_widget_tabs.js
@@ -140,6 +140,14 @@ var et2_tabbox = et2_DOMWidget.extend({
 
 		if (tabsElems.length == 1 && tabpanelsElems.length == 1)
 		{
+
+			// Check for a parent height, we'll apply it to tab panels
+			var height = et2_readAttrWithDefault(_node.parentNode, "height",null);
+			if(height)
+			{
+				this.tabContainer.css("height", height);
+			}
+
 			var tabs = tabsElems[0];
 			var tabpanels = tabpanelsElems[0];
 
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 8109937a5d..cc2bcb7c88 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -542,6 +542,7 @@ ul.et2_link_string {
 	border-style: solid;
 	border-color: silver;
 	padding: 5px;
+	overflow-y: auto;
 }
 
 .et2_tabflag.active {