diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index feecdc02..99defd32 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -2801,6 +2801,10 @@ nav ul li:hover, nav ul li.active {
     margin-top: -8px;
 }
 
+#join-sidebar #share-join-qr {
+    height: 25vh;
+}
+
 .apple-image-link {
     padding-left: 0 !important;
 }
diff --git a/server/public/assets/js/playercontrols.js b/server/public/assets/js/playercontrols.js
index 764f5015..75d16fa6 100755
--- a/server/public/assets/js/playercontrols.js
+++ b/server/public/assets/js/playercontrols.js
@@ -181,7 +181,13 @@ var Playercontrols = {
     },
 
     fullscreen: function() {
-        var playerElement = document.getElementById("player");
+        var playerElement;
+        if(fireplace_initiated) {
+            playerElement = document.getElementById("fireplace_player");
+        } else {
+            playerElement = document.getElementById("player");
+        }
+
         var requestFullScreen = playerElement.requestFullScreen || playerElement.mozRequestFullScreen || playerElement.webkitRequestFullScreen;
         if (requestFullScreen) {
             requestFullScreen.bind(playerElement)();