diff --git a/www/js/channel/chat.js b/www/js/channel/chat.js
index 344bd15..fbe86df 100644
--- a/www/js/channel/chat.js
+++ b/www/js/channel/chat.js
@@ -186,8 +186,12 @@ class chatBox{
     sizeToAspect(){
         if(this.chatPanel.style.display != "none"){
             var targetVidWidth = this.client.player.getRatio() * this.chatPanel.getBoundingClientRect().height;
+            const targetChatWidth = window.innerWidth - targetVidWidth;
+            //This should be changeable in settings later on, for now it defaults to 20%
+            const limit = window.innerWidth * .2;
 
-            this.chatPanel.style.width = `${(document.body.getBoundingClientRect().width - targetVidWidth)}px`;
+            //Set width to target or 20vh depending on whether or not we've hit the width limit
+            this.chatPanel.style.width = targetChatWidth > limit ? `${targetChatWidth}px` : '20vh';
 
             //Fix busted layout
             var pageBreak = document.body.scrollWidth - document.body.getBoundingClientRect().width;
diff --git a/www/js/channel/player.js b/www/js/channel/player.js
index 01a7f92..85ee37b 100644
--- a/www/js/channel/player.js
+++ b/www/js/channel/player.js
@@ -62,7 +62,7 @@ class player{
         this.uiBar.style.display = show ? "flex" : "none";
     }
 
-    toggleVideo(show = this.playerDiv.style.display == "none"){
+    toggleVideo(show = !this.playerDiv.checkVisibility()){
         if(show){
             this.playerDiv.style.display = "flex";
             this.showVideoIcon.style.display = "none";
@@ -78,7 +78,7 @@ class player{
         }
     }
 
-    toggleCinemaMode(cinema = this.navBar.style.display == "none"){
+    toggleCinemaMode(cinema = !this.navBar.checkVisibility()){
         if(cinema){
             this.navBar.style.display = "flex";
         }else{