diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx
index 3c9252434..dfbb2c823 100644
--- a/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx
+++ b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx
@@ -18,7 +18,7 @@ export const ChatHeaderTitle: React.FC<{
   chatTitle: string;
   chatId: string;
   isCompletedStream: boolean;
-}> = React.memo(({ chatTitle, chatId }) => {
+}> = React.memo(({ chatTitle, chatId, isCompletedStream }) => {
   const { mutateAsync: updateChat } = useUpdateChat();
 
   if (!chatTitle) return <div></div>;
@@ -26,7 +26,7 @@ export const ChatHeaderTitle: React.FC<{
   return (
     <AnimatePresence mode="wait" initial={false}>
       <motion.div
-        {...animation}
+        {...(isCompletedStream ? animation : {})}
         key={chatTitle}
         className="flex w-full items-center overflow-hidden">
         <EditableTitle
diff --git a/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/interfaces.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/interfaces.ts
index 907810c19..052362429 100644
--- a/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/interfaces.ts
+++ b/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/interfaces.ts
@@ -8,7 +8,6 @@ export type FileViewConfig = Partial<
     FileView,
     {
       secondaryView: FileViewSecondary;
-      renderView?: boolean; //this is really just used for metric because it has a vertical view and we don't want to render a right panel. undefined defaults to true
     }
   >
 >;
diff --git a/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/useLayoutConfig.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/useLayoutConfig.ts
index bf0cdc54a..3ea97ddd2 100644
--- a/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/useLayoutConfig.ts
+++ b/web/src/layouts/ChatLayout/ChatLayoutContext/useLayoutConfig/useLayoutConfig.ts
@@ -10,6 +10,7 @@ import type { SelectedFile } from '../../interfaces';
 import { timeout } from '@/lib';
 import { useRouter } from 'next/navigation';
 import { BusterRoutes, createBusterRoute } from '@/routes';
+import { SelectedFileSecondaryRenderRecord } from '../../FileContainer/FileContainerSecondary/secondaryPanelsConfig';
 
 export const useLayoutConfig = ({
   selectedFile,
@@ -48,24 +49,31 @@ export const useLayoutConfig = ({
   }, [selectedFileViewConfig, selectedFileId, selectedFileView]);
 
   const selectedFileViewRenderSecondary: boolean = useMemo(() => {
-    if (!selectedFileId || !selectedFileViewConfig || !selectedFileView) return false;
-    if (selectedFileViewConfig?.[selectedFileView]?.secondaryView) {
-      return selectedFileViewConfig?.[selectedFileView]?.renderView !== false;
+    if (!selectedFileViewSecondary || !selectedFileType) return false;
+    if (
+      selectedFileType in SelectedFileSecondaryRenderRecord &&
+      SelectedFileSecondaryRenderRecord[selectedFileType as FileType]?.[
+        selectedFileViewSecondary
+      ] !== undefined
+    ) {
+      return (
+        SelectedFileSecondaryRenderRecord[selectedFileType as FileType]?.[
+          selectedFileViewSecondary
+        ] ?? false
+      );
     }
-    return false;
-  }, [selectedFileViewConfig]);
+    return true;
+  }, [selectedFileViewConfig, selectedFileId, selectedFileView, selectedFileType]);
 
   const onSetFileView = useMemoizedFn(
     async ({
       fileView,
       fileId: fileIdProp,
-      secondaryView,
-      renderView
+      secondaryView
     }: {
       fileView?: FileView;
       fileId?: string | undefined;
       secondaryView?: FileViewSecondary;
-      renderView?: boolean;
     }) => {
       const fileId = fileIdProp ?? selectedFileId;
       if (!fileId) return;
@@ -102,8 +110,7 @@ export const useLayoutConfig = ({
 
             draft[fileId].fileViewConfig[usedFileView] = {
               ...(draft[fileId].fileViewConfig[usedFileView] || {}),
-              secondaryView,
-              renderView
+              secondaryView
             };
           }
         });
diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx
index 44d4224d4..201b6f82f 100644
--- a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx
+++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx
@@ -17,8 +17,7 @@ export const MetricContainerHeaderSegment: React.FC<FileContainerSegmentProps> =
     const onSetFileView = useChatLayoutContextSelector((x) => x.onSetFileView);
 
     const onChange = useMemoizedFn((fileView: SegmentedItem<FileView>) => {
-      const renderView = fileView.value === 'results' ? false : true;
-      onSetFileView({ fileView: fileView.value, renderView });
+      onSetFileView({ fileView: fileView.value });
     });
 
     return (
diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/allConfigs.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/allConfigs.tsx
index 0c0c43fa9..09b5d3881 100644
--- a/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/allConfigs.tsx
+++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/allConfigs.tsx
@@ -1,7 +1,7 @@
 import type { FileType } from '@/api/asset_interfaces/chat';
 import type { FileContainerSecondaryProps } from '../interfaces';
 import React from 'react';
-import { MetricSecondaryRecord } from './metricPanels';
+import { MetricSecondaryRecord, MetrucSecondaryRenderRecord } from './metricPanels';
 import { DashboardSecondaryRecord } from './dashboardPanels';
 
 export const SelectedFileSecondaryRecord: Record<
@@ -12,3 +12,8 @@ export const SelectedFileSecondaryRecord: Record<
   dashboard: DashboardSecondaryRecord,
   reasoning: {}
 };
+
+export const SelectedFileSecondaryRenderRecord: Partial<Record<FileType, Record<string, boolean>>> =
+  {
+    metric: MetrucSecondaryRenderRecord
+  };
diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/metricPanels.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/metricPanels.tsx
index 8ac26d630..78286de22 100644
--- a/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/metricPanels.tsx
+++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerSecondary/secondaryPanelsConfig/metricPanels.tsx
@@ -32,3 +32,7 @@ export const MetricSecondaryRecord: Record<
     <VersionHistoryPanel assetId={selectedFile?.id || ''} type="metric" />
   )
 };
+
+export const MetrucSecondaryRenderRecord: Partial<Record<MetricFileViewSecondary, boolean>> = {
+  'sql-edit': false //we don't want to render the sql edit view in the secondary view because it is vertical
+};