diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 5ff86506..8407702d 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1076,6 +1076,11 @@ export class BrowserWindow {
             BrowserWindow.win.setFullScreen(flag)
         })
 
+        //Fullscreen
+        ipcMain.on('getFullScreen', (event, flag) => {
+            event.returnValue = BrowserWindow.win.isFullScreen()
+        })
+
         //Fullscreen
         ipcMain.on('detachDT', (_event, _) => {
             BrowserWindow.win.webContents.openDevTools({mode: 'detach'});
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 9145c1bd..e1fa1b10 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -29,6 +29,7 @@ const app = new Vue({
             limit: 10
         },
         fullscreenLyrics: false,
+        fullscreenState: ipcRenderer.sendSync("getFullScreen"),
         playerLCD: {
             playbackDuration: 0,
             desiredDuration: 0,
@@ -4130,10 +4131,11 @@ const app = new Vue({
             });
         },
         fullscreen(flag) {
+            this.fullscreenState = flag; 
             if (flag) {
                 ipcRenderer.send('setFullScreen', true);
                 if (app.mk.nowPlayingItem.type && app.mk.nowPlayingItem.type.toLowerCase().includes("video")) {
-                    document.querySelector('video#apple-music-video-player').requestFullscreen()
+                   // document.querySelector('video#apple-music-video-player').requestFullscreen()
                 } else {
                     app.appMode = 'fullscreen';
                 }
@@ -4144,9 +4146,21 @@ const app = new Vue({
                 });
             } else {
                 ipcRenderer.send('setFullScreen', false);
-                app.appMode = 'player';
+                if (app.mk.nowPlayingItem.type && app.mk.nowPlayingItem.type.toLowerCase().includes("video")) {
+
+                } else {
+                    app.appMode = 'player';
+                }
             }
         },
+        pip(){
+            document.querySelector('video#apple-music-video-player').requestPictureInPicture()
+            // .then(pictureInPictureWindow => {
+            //     pictureInPictureWindow.addEventListener("resize", () => {
+            //         console.log("[PIP] Resized")
+            //     }, false);
+            //   })
+        },
         miniPlayer(flag) {
             if (flag) {
                 this.tmpWidth = window.innerWidth;
diff --git a/src/renderer/style.less b/src/renderer/style.less
index 6009522d..6248ded5 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -2971,7 +2971,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   float: left;
   display: none;
   width: 100%;
-  height: calc(100% - var(--chromeHeight));
+  height: 100%;
   bottom: 0;
   z-index: 100000; 
 }
diff --git a/src/renderer/views/app/panels.ejs b/src/renderer/views/app/panels.ejs
index f748bfb9..15cbf4f7 100644
--- a/src/renderer/views/app/panels.ejs
+++ b/src/renderer/views/app/panels.ejs
@@ -112,13 +112,15 @@
                             </template>
                 </div> 
                 <div id="player-pip"
-                    @click="document.querySelector('video#apple-music-video-player').requestPictureInPicture()"
-                    title="Picture-in-Picture">
+                    @click="pip()"
+                    title="Picture-in-Picture"
+                    v-b-tooltip.hover>
                     <%- include("../svg/pip.svg") %>
                 </div>
                 <div id="player-fullscreen"
-                    @click="document.querySelector('video#apple-music-video-player').requestFullscreen()"
-                    title="Fullscreen">
+                    @click="fullscreen(!fullscreenState)"
+                    title="Fullscreen"
+                    v-b-tooltip.hover>
                     <%- include("../svg/fullscreen.svg") %>
                 </div>       
             </div>