diff --git a/plugins/picture-in-picture/front.js b/plugins/picture-in-picture/front.js
index f57f20ae..685b15c1 100644
--- a/plugins/picture-in-picture/front.js
+++ b/plugins/picture-in-picture/front.js
@@ -33,15 +33,14 @@ const listenForToggle = () => {
 	const clonedExitButton = originalExitButton.cloneNode(true);
 	clonedExitButton.onclick = () => togglePictureInPicture();
 
-	const player = $('#player');
-	const onPlayerDblClick = player.onDoubleClick_;
-
-	const playerBar = $("ytmusic-player-bar");
+	const appLayout = $("ytmusic-app-layout");
 	const expandMenu = $('#expanding-menu');
 	const middleControls = $('.middle-controls');
 	const playerPage = $("ytmusic-player-page");
 	const togglePlayerPageButton = $(".toggle-player-page-button");
 	const fullScreenButton = $(".fullscreen-button");
+	const player = $('#player');
+	const onPlayerDblClick = player.onDoubleClick_;
 
 	ipcRenderer.on('pip-toggle', (_, isPip) => {
 		if (isPip) {
@@ -52,13 +51,13 @@ const listenForToggle = () => {
 				togglePlayerPageButton.click();
 			}
 			fullScreenButton.click();
-			playerBar.classList.add("pip");
+			appLayout.classList.add("pip");
 		} else {
 			$(".exit-fullscreen-button").replaceWith(originalExitButton);
 			player.onDoubleClick_ = onPlayerDblClick;
 			expandMenu.onmouseleave = undefined;
 			originalExitButton.click();
-			playerBar.classList.remove("pip");
+			appLayout.classList.remove("pip");
 		}
 	});
 }
diff --git a/plugins/picture-in-picture/style.css b/plugins/picture-in-picture/style.css
index ee890c65..beb45251 100644
--- a/plugins/picture-in-picture/style.css
+++ b/plugins/picture-in-picture/style.css
@@ -1,14 +1,21 @@
-ytmusic-player-bar.pip svg,
-ytmusic-player-bar.pip .time-info,
-ytmusic-player-bar.pip yt-formatted-string,
-ytmusic-player-bar.pip .yt-formatted-string {
+/* improve visibility of the player bar elements */
+ytmusic-app-layout.pip ytmusic-player-bar svg,
+ytmusic-app-layout.pip ytmusic-player-bar .time-info,
+ytmusic-app-layout.pip ytmusic-player-bar yt-formatted-string,
+ytmusic-app-layout.pip ytmusic-player-bar .yt-formatted-string {
     filter: drop-shadow(2px 4px 6px black);
     color: white !important;
     fill: white !important;
 }
 
-ytmusic-player-bar.pip ytmusic-player-expanding-menu {
+/* improve the style of the player bar expanding menu */
+ytmusic-app-layout.pip ytmusic-player-expanding-menu {
 	border-radius: 30px;
 	background-color: rgba(0, 0, 0, 0.3);
 	backdrop-filter: blur(5px) brightness(20%);
 }
+
+/* fix volumeHud position when both in-app-menu and PiP are active */
+.cet-container ytmusic-app-layout.pip #volumeHud{
+	top: 22px !important;
+}