diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php
index 0b0bab10..36fb3c69 100644
--- a/codepot/src/codepot/views/code_blame.php
+++ b/codepot/src/codepot/views/code_blame.php
@@ -49,7 +49,8 @@ else
 $(function () {
 
 	$('#code_blame_metadata').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	$("#code_blame_mainarea_loc_info").hide();
diff --git a/codepot/src/codepot/views/code_diff.php b/codepot/src/codepot/views/code_diff.php
index 3e93f0dc..dec9e105 100644
--- a/codepot/src/codepot/views/code_diff.php
+++ b/codepot/src/codepot/views/code_diff.php
@@ -72,11 +72,13 @@ else
 <script type="text/javascript">
 $(function() {
 	$('#code_diff_metadata').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	$('#code_diff_metadata_against').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 
diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php
index 52b178ea..179b43e7 100644
--- a/codepot/src/codepot/views/code_file.php
+++ b/codepot/src/codepot/views/code_file.php
@@ -70,7 +70,8 @@ function showRawCode()
 $(function () {
 
 	$('#code_file_metadata').accordion({
-		collapsible: true
+		collapsible: true,
+                heightStyle: "content"
 	});
 
 	$("#code_file_mainarea_loc_info").hide();
diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php
index bd9c08ed..7ced06d2 100644
--- a/codepot/src/codepot/views/code_folder.php
+++ b/codepot/src/codepot/views/code_folder.php
@@ -615,7 +615,9 @@ $(function () {
 <?php endif; ?>
 
 	$('#code_folder_metadata').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
+
 	});
 
 	<?php if ($revision > 0 && $revision < $next_revision): ?>
diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php
index 864178cd..50aae70d 100644
--- a/codepot/src/codepot/views/code_revision.php
+++ b/codepot/src/codepot/views/code_revision.php
@@ -502,19 +502,23 @@ function hide_unneeded_divs()
 
 $(function() {
 	$("#code_revision_metadata").accordion ({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	$("#code_revision_result_files").accordion ({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	$("#code_revision_result_properties").accordion ({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	$("#code_revision_result_comments").accordion ({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	hide_unneeded_divs ();
diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php
index c7578021..3cc24fd8 100644
--- a/codepot/src/codepot/views/file_show.php
+++ b/codepot/src/codepot/views/file_show.php
@@ -167,11 +167,13 @@ var original_file_desc = [
 
 $(function () {
 	$('#file_show_mainarea_metadata').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	$('#file_show_mainarea_files').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index c749a4b2..16c113ed 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -210,7 +210,8 @@ var original_file_desc = [
 $(function () { 
 
 	$('#issue_show_mainarea_state').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 <?php if (isset($login['id']) && $login['id'] != ''): ?>
diff --git a/codepot/src/codepot/views/project_catalog.php b/codepot/src/codepot/views/project_catalog.php
index d72f22fb..166a1983 100644
--- a/codepot/src/codepot/views/project_catalog.php
+++ b/codepot/src/codepot/views/project_catalog.php
@@ -157,7 +157,8 @@ $(function () {
 	render_project_pages (total_num_avail, total_num_shown, req_page_offset, req_page_size);
 
 	$("#project_catalog_mainarea_search_form").accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 });
diff --git a/codepot/src/codepot/views/wiki_show.php b/codepot/src/codepot/views/wiki_show.php
index 28c0d8a4..5af5ca97 100644
--- a/codepot/src/codepot/views/wiki_show.php
+++ b/codepot/src/codepot/views/wiki_show.php
@@ -60,7 +60,8 @@ function render_wiki()
 
 $(function () {
 	$('#wiki_show_mainarea_metadata').accordion({
-		collapsible: true
+		collapsible: true,
+		heightStyle: "content"
 	});
 
 	render_wiki ();