diff --git a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
index 7e2bb22b..bbdc40b4 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
@@ -89,19 +89,6 @@ export function AgentConfig({
         setLocalName(agent.name);
     }, [agent.name]);
 
-    // Store active tab in URL hash to persist across re-renders
-    useEffect(() => {
-        const hash = window.location.hash.slice(1);
-        if (hash === 'instructions' || hash === 'configurations') {
-            setActiveTab(hash as TabType);
-        }
-    }, []);
-
-    const handleTabChange = (tab: TabType) => {
-        setActiveTab(tab);
-        window.location.hash = tab;
-    };
-
     // Track changes in RAG datasources
     useEffect(() => {
         const currentSources = agent.ragDataSources || [];
@@ -211,7 +198,7 @@ export function AgentConfig({
                     {(['instructions', 'configurations'] as TabType[]).map((tab) => (
                         <button
                             key={tab}
-                            onClick={() => handleTabChange(tab)}
+                            onClick={() => setActiveTab(tab)}
                             className={clsx(
                                 "px-4 py-2 text-sm font-medium transition-colors relative",
                                 activeTab === tab
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx b/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
index 992cade2..6b90242e 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
@@ -1018,7 +1018,7 @@ export function WorkflowEditor({
                     projectTools={projectTools}
                 />
                 {state.present.selection?.type === "agent" && <AgentConfig
-                    key={state.present.selection.name}
+                    key={`agent-${state.present.workflow.agents.findIndex(agent => agent.name === state.present.selection!.name)}`}
                     projectId={state.present.workflow.projectId}
                     workflow={state.present.workflow}
                     agent={state.present.workflow.agents.find((agent) => agent.name === state.present.selection!.name)!}