diff --git a/web/src/api/buster_rest/chats/queryRequests.ts b/web/src/api/buster_rest/chats/queryRequests.ts
index d4a636c96..8378d467b 100644
--- a/web/src/api/buster_rest/chats/queryRequests.ts
+++ b/web/src/api/buster_rest/chats/queryRequests.ts
@@ -76,7 +76,9 @@ export const useGetChat = <TData = IBusterChat>(
       const lastMessage = iChatMessages[lastMessageId!];
       if (lastMessage) {
         Object.values(lastMessage.response_messages).forEach((responseMessage) => {
-          prefetchGetMetricDataClient({ id: responseMessage.id }, queryClient);
+          if (responseMessage.type === 'file' && responseMessage.file_type === 'metric') {
+            prefetchGetMetricDataClient({ id: responseMessage.id }, queryClient);
+          }
         });
       }
 
diff --git a/web/src/components/ui/layouts/AppPageLayout.tsx b/web/src/components/ui/layouts/AppPageLayout.tsx
index 604637506..0e5b6c563 100644
--- a/web/src/components/ui/layouts/AppPageLayout.tsx
+++ b/web/src/components/ui/layouts/AppPageLayout.tsx
@@ -40,7 +40,10 @@ export const AppPageLayout: React.FC<
       )}>
       {header && (
         <AppPageLayoutHeader
-          className={headerClassName}
+          className={cn(
+            headerBorderVariant === 'ghost' && 'relative z-10 -mt-[1px]',
+            headerClassName
+          )}
           sizeVariant={headerSizeVariant}
           borderVariant={headerBorderVariant}>
           {header}