diff --git a/media_server/static/css/styles.css b/media_server/static/css/styles.css
index f5feb72..c442b09 100644
--- a/media_server/static/css/styles.css
+++ b/media_server/static/css/styles.css
@@ -903,6 +903,13 @@ button:disabled {
     gap: 0.75rem;
 }
 
+.player-toggles {
+    display: flex;
+    align-items: center;
+    gap: 0.375rem;
+    margin-left: auto;
+}
+
 .vinyl-toggle-btn {
     width: 28px;
     height: 28px;
@@ -916,7 +923,6 @@ button:disabled {
     align-items: center;
     justify-content: center;
     transition: all 0.2s;
-    margin-left: auto;
 }
 
 .vinyl-toggle-btn:hover {
diff --git a/media_server/static/index.html b/media_server/static/index.html
index a02be49..d89f53a 100644
--- a/media_server/static/index.html
+++ b/media_server/static/index.html
@@ -187,12 +187,14 @@
 
                     <div class="source-info">
                         <span data-i18n="player.source">Source:</span> <span id="source" data-i18n="player.unknown_source">Unknown</span>
-                        <button class="vinyl-toggle-btn" onclick="toggleVinylMode()" id="vinylToggle" data-i18n-title="player.vinyl" title="Vinyl mode">
-                            <svg viewBox="0 0 24 24" width="16" height="16"><circle cx="12" cy="12" r="10" fill="none" stroke="currentColor" stroke-width="1.5"/><circle cx="12" cy="12" r="3" fill="currentColor"/><circle cx="12" cy="12" r="6.5" fill="none" stroke="currentColor" stroke-width="0.5" opacity="0.5"/></svg>
-                        </button>
-                        <button class="vinyl-toggle-btn" onclick="toggleVisualizer()" id="visualizerToggle" data-i18n-title="player.visualizer" title="Audio visualizer" style="display:none">
-                            <svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M3 18h2v-8H3v8zm4 0h2V6H7v12zm4 0h2V2h-2v16zm4 0h2v-6h-2v6zm4 0h2V9h-2v9z"/></svg>
-                        </button>
+                        <div class="player-toggles">
+                            <button class="vinyl-toggle-btn" onclick="toggleVinylMode()" id="vinylToggle" data-i18n-title="player.vinyl" title="Vinyl mode">
+                                <svg viewBox="0 0 24 24" width="16" height="16"><circle cx="12" cy="12" r="10" fill="none" stroke="currentColor" stroke-width="1.5"/><circle cx="12" cy="12" r="3" fill="currentColor"/><circle cx="12" cy="12" r="6.5" fill="none" stroke="currentColor" stroke-width="0.5" opacity="0.5"/></svg>
+                            </button>
+                            <button class="vinyl-toggle-btn" onclick="toggleVisualizer()" id="visualizerToggle" data-i18n-title="player.visualizer" title="Audio visualizer" style="display:none">
+                                <svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M3 18h2v-8H3v8zm4 0h2V6H7v12zm4 0h2V2h-2v16zm4 0h2v-6h-2v6zm4 0h2V9h-2v9z"/></svg>
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/media_server/static/js/app.js b/media_server/static/js/app.js
index 5347846..a1dbb11 100644
--- a/media_server/static/js/app.js
+++ b/media_server/static/js/app.js
@@ -286,6 +286,8 @@
         window.addEventListener('beforeunload', saveVinylAngle);
 
         function toggleVinylMode() {
+            // Save current angle before turning off (must happen while still in vinyl mode)
+            if (vinylMode) saveVinylAngle();
             vinylMode = !vinylMode;
             localStorage.setItem('vinylMode', vinylMode);
             applyVinylMode();