diff --git a/src/plugins/ambient-mode/style.css b/src/plugins/ambient-mode/style.css
index fb72427d..78fcf55b 100644
--- a/src/plugins/ambient-mode/style.css
+++ b/src/plugins/ambient-mode/style.css
@@ -34,3 +34,12 @@
   margin: 0 auto !important;
   overflow: visible;
 }
+
+/* Fix ambient mode overlapping other elements #2520 */
+.song-button.ytmusic-av-toggle, .video-button.ytmusic-av-toggle {
+  z-index: 1;
+  background-color: transparent;
+}
+#side-panel.side-panel.ytmusic-player-page {
+  z-index: 0;
+}
diff --git a/src/plugins/video-toggle/index.ts b/src/plugins/video-toggle/index.ts
index 5e904916..830a7d42 100644
--- a/src/plugins/video-toggle/index.ts
+++ b/src/plugins/video-toggle/index.ts
@@ -129,6 +129,9 @@ export default createPlugin({
           document
             .querySelector('ytmusic-player')
             ?.setAttribute('has-av-switcher', '');
+          document
+            .querySelector('ytmusic-av-toggle')
+            ?.removeAttribute('toggle-disabled');
           return;
         }
 
@@ -139,6 +142,9 @@ export default createPlugin({
           document
             .querySelector('ytmusic-player')
             ?.removeAttribute('has-av-switcher');
+          document
+            .querySelector('ytmusic-av-toggle')
+            ?.setAttribute('toggle-disabled', '');
           return;
         }
       }