diff --git a/css/layout.css b/css/layout.css
index 0d122386..1082ea00 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -34,6 +34,11 @@ body {
 	overflow:	auto;
 }
 
+/* Overflow is handled by tabsets inside the panel */
+.ui-layout-center {
+	overflow: hidden !important;
+}
+
 /*
 *	RESIZER-BARS
 */
diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss
index 2db8b763..a87c4b89 100644
--- a/templates/LeftAndMain.ss
+++ b/templates/LeftAndMain.ss
@@ -19,7 +19,7 @@
 		$Left
 	</div>
 		
-	<div class="ui-layout-center" id="right">
+	<div class="ui-layout-center right" id="right">
 		$Right
 	</div>