diff --git a/js/simple_graph.js b/js/simple_graph.js
index 1a3c206a3..114bf7f15 100644
--- a/js/simple_graph.js
+++ b/js/simple_graph.js
@@ -801,7 +801,11 @@ $(function()
 			}
 			var aContexts = [];
 			$('#'+sId+'_contexts').multiselect('getChecked').each(function() { aContexts[$(this).val()] = me.options.additional_contexts[$(this).val()].oql; });
-			//this.element.closest('.ui-tabs').tabs({ heightStyle: "fill" });
+			// Don't set the height on the tabs widget, only on the current tab
+			// Adjust the height of the graph to the window size
+			var sTabHeight = parseInt($(window).height() - this.element.parent().offset().top - 50);
+			this.element.closest('.ui-tabs-panel').css({ height: sTabHeight + "px" });
+
 			this.adjust_height();
 			this._close_all_tooltips();
 			this.oPaper.rect(this.xPan, this.yPan, this.element.width(), this.element.height()).attr({fill: '#000', opacity: 0.4, 'stroke-width': 0});