diff --git a/src/renderer/App.js b/src/renderer/App.js
index 555369ae5..b5f11d3c0 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -145,7 +145,7 @@ export default Vue.extend({
     }
   },
   created () {
-    this.setBodyTheme()
+    this.checkThemeSettings()
     this.setWindowTitle()
   },
   mounted: function () {
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index c08040f99..5fe9201b6 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -182,10 +182,14 @@ export default Vue.extend({
       // only hide/show the button once the player is available
       this.pictureInPictureButtonInverval = setInterval(() => {
         if (!this.hidePlayer) {
+          const pipButton = document.querySelector('.vjs-picture-in-picture-control')
+          if (pipButton === null) {
+            return
+          }
           if (format === 'audio') {
-            document.querySelector('.vjs-picture-in-picture-control').classList.add('vjs-hidden')
+            pipButton.classList.add('vjs-hidden')
           } else {
-            document.querySelector('.vjs-picture-in-picture-control').classList.remove('vjs-hidden')
+            pipButton.classList.remove('vjs-hidden')
           }
           clearInterval(this.pictureInPictureButtonInverval)
         }