diff --git a/demos/demos.css b/demos/demos.css
index aedfa34d9..a5f1ed61b 100644
--- a/demos/demos.css
+++ b/demos/demos.css
@@ -64,10 +64,6 @@ body {
 
 /* Demos */
 
-.normal h3.demo-header { font-size:32px; padding:0 0 5px; border-bottom:1px solid #eee; text-transform: capitalize; }
-
-.normal h4.demo-subheader { font-size:10px; text-transform: uppercase; color:#999; padding:8px 0 3px; border:0; margin:0; }
-
 .demos-nav, .demos-nav dt, .demos-nav dd {
 	margin: 0;
 	padding: 0
@@ -113,6 +109,8 @@ body {
 eventually we should convert the font sizes to ems -- using px for now to minimize style conflicts
 */
 
+.normal h3.demo-header { font-size:32px; padding:0 0 5px; border-bottom:1px solid #eee; text-transform: capitalize; }
+.normal h4.demo-subheader { font-size:10px; text-transform: uppercase; color:#999; padding:8px 0 3px; border:0; margin:0; }
 .normal a:link,
 .normal a:visited { color:#1b75bb; text-decoration:none; }
 .normal a:hover,
@@ -125,6 +123,8 @@ eventually we should convert the font sizes to ems -- using px for now to minimi
 #demo-config-menu { float:right; width:150px; }
 #demo-config-menu h4 { font-size:13px; color:#666; font-weight:normal; border:0; padding-left:18px; }
 
+#demo-config-menu ul { list-style: none; padding: 0; margin: 0; }
+
 #demo-config-menu li { font-size:11px; padding:0 0 0 10px; margin:3px 0; zoom: 1; }
 
 #demo-config-menu li a:link, 
@@ -157,4 +157,4 @@ eventually we should convert the font sizes to ems -- using px for now to minimi
 #demo-source a.source-closed:link,
 #demo-source a.source-closed:visited,
 #demo-source a.source-closed:hover,
-#demo-source a.source-closed:active { background-image: url(images/demo-spindown-closed.gif); }
+#demo-source a.source-closed:active { background-image: url(images/demo-spindown-closed.gif); }
\ No newline at end of file
diff --git a/demos/index.html b/demos/index.html
index 0e3990637..e26cc48c3 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -30,10 +30,14 @@
 				.find('#demo-config')
 					.append('<iframe id="demo-frame" name="demo-frame" width="520" height="314" scrolling="auto" frameborder="0" src="'+ section +'/default.html"></iframe><div id="demo-config-menu"></div>')
 					.find('#demo-config-menu')
-						.load(this.href, function(){
+						.load(this.href + ' #container', function(){
 							$('#demo-config-menu a').each(function(){
 								this.setAttribute('href', section + '/' + this.getAttribute('href'));
 								$(this).attr('target', 'demo-frame');
+								$(this).click(function(){
+									$(this).parents('ul').find('li').removeClass('demo-config-on');
+									$(this).parent().addClass('demo-config-on');
+								});
 							});
 						})
 					.end()