diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 893a0c4..cd1b75d 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -651,9 +651,18 @@ export default function LiveTradingApp() {
     setRuntimeConfigFeedback(null);
     setAgentSkillsFeedback(null);
     setWorkspaceFileFeedback(null);
-    setIsRuntimeSettingsOpen((prev) => !prev);
+    setIsRuntimeSettingsOpen((prev) => {
+      const nextOpen = !prev;
+      if (nextOpen) {
+        // Initialize watchlist draft when opening settings
+        setWatchlistDraftSymbols(runtimeWatchlistSymbols);
+        setWatchlistInputValue('');
+        setWatchlistFeedback(null);
+      }
+      return nextOpen;
+    });
     setIsWatchlistPanelOpen(false);
-  }, []);
+  }, [runtimeWatchlistSymbols]);
 
   const requestAgentSkills = useCallback((agentId) => {
     const normalized = typeof agentId === 'string' ? agentId.trim() : '';