diff --git a/js/list.js b/js/list.js
index 248d7b2f..cb13a4fc 100755
--- a/js/list.js
+++ b/js/list.js
@@ -55,11 +55,15 @@ function updateList()
 			"</div>";
 			$("#wrapper").append(finalhtml);
 		});
-		if($("#playlist").height() != $("#player").height())
+		if($("#playlist").height() != $("#player").height() || ($("#chan").html().toLowerCase() == "jazz" && $("#playlist").height() != $("#jplayer").height()))
 		{
 			if(!window.mobilecheck())
 			{
-				$("#playlist").css({height: $("#player").height()-$("#adminPanel").outerHeight(true)-$("#findform").outerHeight(true)+30});
+				if($("#chan").html().toLowerCase() == "jazz")
+				{
+					player_name = "#jplayer";
+				}else player_name = "#player";
+				$("#playlist").css({height: $(player_name).height()-$("#adminPanel").outerHeight(true)-$("#findform").outerHeight(true)+30});
 				$("#playlist").css({overflow: "hidden"});
 				if(scroller === false)
 				{
diff --git a/static/style.css b/static/style.css
index 60d1a0ae..bf3a49fb 100755
--- a/static/style.css
+++ b/static/style.css
@@ -504,7 +504,7 @@ input[type="radio"] {
     filter:brightness(100%) !important;
 }
 
-.jp {
+#jplayer {
     display:none;
      -webkit-transition: opacity 1s;
     transition: opacity 1s;