diff --git a/web_server.py b/web_server.py
index 083af906..117c74c6 100644
--- a/web_server.py
+++ b/web_server.py
@@ -7383,6 +7383,8 @@ def clear_plex_library_preference():
         from database.music_database import MusicDatabase
         db = MusicDatabase()
         db.set_preference('plex_music_library', '')
+        if plex_client:
+            plex_client.music_library = None
         return jsonify({"success": True, "message": "Plex library preference cleared."})
     except Exception as e:
         logger.error(f"Error clearing Plex library preference: {e}")
diff --git a/webui/index.html b/webui/index.html
index 8287bc5d..d60dc5f5 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -4322,10 +4322,16 @@
                                         <div class="form-group">
                                             <label>Plex Server URL:</label>
                                             <input type="url" id="plex-url" placeholder="http://localhost:32400">
+                                            <div class="form-actions" id="plex-url-actions" style="justify-content:flex-end; width: 100%; flex-basis: 100%; margin-top: 8px;">
+                                                <button id="plex-autodetect-button" class="detect-button" onclick="autoDetectPlex()">Auto-detect</button>
+                                            </div>
                                         </div>
                                         <div class="form-group">
                                             <label>Plex Token:</label>
                                             <input type="password" id="plex-token" placeholder="X-Plex-Token">
+                                            <div class="form-actions" id="plex-token-actions" style="justify-content:flex-end; width: 100%; flex-basis: 100%; margin-top: 8px;">
+                                                <button id="plex-connect-button" class="test-button" onclick="testConnection('plex')">Connect</button>
+                                            </div>
                                         </div>
                                         <div class="form-group" id="plex-library-selector-container" style="display: none;">
                                             <label>Music Library:</label>
@@ -4337,8 +4343,6 @@
                                             </small>
                                         </div>
                                         <div class="form-actions">
-                                            <button class="detect-button" onclick="autoDetectPlex()">Auto-detect</button>
-                                            <button class="test-button" onclick="testConnection('plex')">Test</button>
                                             <button class="detect-button" onclick="clearPlexConfiguration()">Clear Configuration</button>
                                         </div>
                                     </div>
diff --git a/webui/static/script.js b/webui/static/script.js
index ef1d6463..685f888f 100644
--- a/webui/static/script.js
+++ b/webui/static/script.js
@@ -5987,6 +5987,25 @@ function updateLossyBitrateOptions() {
     }
 }
 
+function updatePlexConfigurationButtons() {
+    const plexUrl = document.getElementById('plex-url');
+    const plexToken = document.getElementById('plex-token');
+    const hasPlexConfig = Boolean((plexUrl?.value || '').trim() || (plexToken?.value || '').trim());
+    const plexViewConfigButton = document.getElementById('plex-view-config-button');
+    const plexLinkToPlexButton = document.getElementById('plex-link-to-plex-button');
+    const plexManualConfigButton = document.getElementById('plex-manual-config-button');
+    const plexUrlActions = document.getElementById('plex-url-actions');
+    const plexTokenActions = document.getElementById('plex-token-actions');
+    const plexPinAuthFlow = document.getElementById('plex-pin-auth-flow');
+
+    if (plexViewConfigButton) plexViewConfigButton.style.display = hasPlexConfig ? '' : 'none';
+    if (plexLinkToPlexButton) plexLinkToPlexButton.style.display = hasPlexConfig ? 'none' : '';
+    if (plexManualConfigButton) plexManualConfigButton.style.display = hasPlexConfig ? 'none' : '';
+    if (plexUrlActions) plexUrlActions.style.display = hasPlexConfig ? 'none' : 'flex';
+    if (plexTokenActions) plexTokenActions.style.display = hasPlexConfig ? 'none' : 'flex';
+    if (plexPinAuthFlow) plexPinAuthFlow.style.display = 'none';
+}
+
 async function loadSettingsData() {
     try {
         const response = await fetch(API.settings);
@@ -6024,25 +6043,13 @@ async function loadSettingsData() {
         });
 
         // Populate Plex settings
-        document.getElementById('plex-url').value = settings.plex?.base_url || '';
-        document.getElementById('plex-token').value = settings.plex?.token || '';
-        const hasPlexConfig = Boolean(settings.plex?.base_url || settings.plex?.token);
-        const plexViewConfigButton = document.getElementById('plex-view-config-button');
-        const plexLinkToPlexButton = document.getElementById('plex-link-to-plex-button');
-        const plexManualConfigButton = document.getElementById('plex-manual-config-button');
-        const plexPinAuthFlow = document.getElementById('plex-pin-auth-flow');
-        if (plexViewConfigButton) {
-            plexViewConfigButton.style.display = hasPlexConfig ? '' : 'none';
-        }
-        if (plexLinkToPlexButton) {
-            plexLinkToPlexButton.style.display = hasPlexConfig ? 'none' : '';
-        }
-        if (plexManualConfigButton) {
-            plexManualConfigButton.style.display = hasPlexConfig ? 'none' : '';
-        }
-        if (plexPinAuthFlow) {
-            plexPinAuthFlow.style.display = 'none';
-        }
+        const plexUrlInput = document.getElementById('plex-url');
+        const plexTokenInput = document.getElementById('plex-token');
+        if (plexUrlInput) plexUrlInput.value = settings.plex?.base_url || '';
+        if (plexTokenInput) plexTokenInput.value = settings.plex?.token || '';
+        if (plexUrlInput) plexUrlInput.addEventListener('input', updatePlexConfigurationButtons);
+        if (plexTokenInput) plexTokenInput.addEventListener('input', updatePlexConfigurationButtons);
+        updatePlexConfigurationButtons();
 
         // Populate Jellyfin settings
         document.getElementById('jellyfin-url').value = settings.jellyfin?.base_url || '';
@@ -6443,12 +6450,17 @@ function showPlexConfiguration(disableFields = false) {
     const plexPinAuthFlow = document.getElementById('plex-pin-auth-flow');
     const plexUrl = document.getElementById('plex-url');
     const plexToken = document.getElementById('plex-token');
+    const plexLibraryContainer = document.getElementById('plex-library-selector-container');
 
     if (plexConfig) plexConfig.style.display = '';
     if (plexSetup) plexSetup.style.display = 'none';
     if (plexPinAuthFlow) plexPinAuthFlow.style.display = 'none';
     if (plexUrl) plexUrl.disabled = disableFields;
     if (plexToken) plexToken.disabled = disableFields;
+    if (plexLibraryContainer && !disableFields) {
+        plexLibraryContainer.style.display = 'none';
+    }
+    updatePlexConfigurationButtons();
 }
 
 async function startPlexPinAuth() {
@@ -6560,7 +6572,7 @@ function restartPlexPinAuth() {
     startPlexPinAuth();
 }
 
-function clearPlexConfiguration() {
+async function clearPlexConfiguration() {
     cancelPlexPinAuth();
     const plexUrl = document.getElementById('plex-url');
     const plexToken = document.getElementById('plex-token');
@@ -6580,6 +6592,17 @@ function clearPlexConfiguration() {
     if (plexLinkToPlexButton) plexLinkToPlexButton.style.display = '';
     if (plexManualConfigButton) plexManualConfigButton.style.display = '';
 
+    const plexLibraryContainer = document.getElementById('plex-library-selector-container');
+    const plexLibrarySelect = document.getElementById('plex-music-library');
+    if (plexLibrarySelect) {
+        plexLibrarySelect.innerHTML = '<option value="">Select a music library</option>';
+    }
+    if (plexLibraryContainer) {
+        plexLibraryContainer.style.display = 'none';
+    }
+
+    updatePlexConfigurationButtons();
+
     try {
         await fetch('/api/plex/clear-library', { method: 'POST' });
     } catch (e) {