diff --git a/www/assets/js/ui.js b/www/assets/js/ui.js
index 5e9e5e6e..2f3b5a5b 100644
--- a/www/assets/js/ui.js
+++ b/www/assets/js/ui.js
@@ -339,12 +339,14 @@ $("#shuffleplaylist").click(function() {
 
 /* layout stuff */
 $(window).resize(function() {
-    VWIDTH = $("#ytapiplayer").parent().css("width").replace("px", "");
-    var VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
+    VWIDTH = $("#queue").css("width").replace("px", "");
+    VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
     $("#messagebuffer").css("height", (VHEIGHT - 31) + "px");
     $("#userlist").css("height", (VHEIGHT - 31) + "px");
-    $("#ytapiplayer").attr("width", VWIDTH);
-    $("#ytapiplayer").attr("height", VHEIGHT);
+    if($("#ytapiplayer").length > 0) {
+        $("#ytapiplayer").attr("width", VWIDTH);
+        $("#ytapiplayer").attr("height", VHEIGHT);
+    }
 });
 
 
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 85a5ff38..59c1990b 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -574,7 +574,10 @@ function applyOpts() {
     }
 
     if(USEROPTS.hidevid) {
+        $("#qualitywrap").html("");
         $("#videowrap").remove();
+        $("#chatwrap").removeClass("span5").addClass("span12");
+        $("#chatline").removeClass().addClass("span12");
     }
 
     $("#chatbtn").remove();
@@ -1282,12 +1285,15 @@ function fluidLayout() {
     $(".container").each(function() {
         $(this).removeClass("container").addClass("container-fluid");
     });
-    VWIDTH = $("#ytapiplayer").parent().css("width").replace("px", "");
+    // Video might not be there, but the playlist is
+    VWIDTH = $("#queue").css("width").replace("px", "");
     VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
+    if($("#ytapiplayer").length > 0) {
+        $("#ytapiplayer").attr("width", VWIDTH);
+        $("#ytapiplayer").attr("height", VHEIGHT);
+    }
     $("#messagebuffer").css("height", (VHEIGHT - 31) + "px");
     $("#userlist").css("height", (VHEIGHT - 31) + "px");
-    $("#ytapiplayer").attr("width", VWIDTH);
-    $("#ytapiplayer").attr("height", VHEIGHT);
     $("#chatline").removeClass().addClass("span12");
     $("#channelsettingswrap3").css("margin-left", "0");
 }