diff --git a/apps/studio/components/interfaces/QueryInsights/components/MetricsChart.tsx b/apps/studio/components/interfaces/QueryInsights/components/MetricsChart.tsx
index 30b3ef00129..5ab0fbba2e5 100644
--- a/apps/studio/components/interfaces/QueryInsights/components/MetricsChart.tsx
+++ b/apps/studio/components/interfaces/QueryInsights/components/MetricsChart.tsx
@@ -202,10 +202,10 @@ export function MetricsChart({
                     exit={{ opacity: 0, scale: 0.95, x: -8 }}
                     transition={{ duration: 0.15 }}
                     className={cn(
-                      'text-xs px-2 py-1 rounded-full transition-colors inline-flex items-center gap-1.5',
+                      'text-xs px-2 py-1 rounded-full transition-colors inline-flex items-center gap-1.5 border',
                       visibleMetrics[key as keyof typeof visibleMetrics]
                         ? 'bg-surface-300'
-                        : 'hover:bg-surface-100'
+                        : 'hover:bg-surface-100 border-transparent'
                     )}
                     onClick={() =>
                       setVisibleMetrics((prev) => ({
@@ -215,7 +215,10 @@ export function MetricsChart({
                     }
                   >
                     <div
-                      className="w-2 h-2 rounded-full"
+                      className={cn(
+                        'w-2 h-2 rounded-full',
+                        !visibleMetrics[key as keyof typeof visibleMetrics] && 'opacity-50'
+                      )}
                       style={{ backgroundColor: value.color }}
                     />
                     <span>
diff --git a/apps/studio/components/interfaces/QueryInsights/components/QueryList.tsx b/apps/studio/components/interfaces/QueryInsights/components/QueryList.tsx
index 5980db397a2..91a7965dbc0 100644
--- a/apps/studio/components/interfaces/QueryInsights/components/QueryList.tsx
+++ b/apps/studio/components/interfaces/QueryInsights/components/QueryList.tsx
@@ -3,7 +3,7 @@ import { useRef, useState, useEffect } from 'react'
 import DataGrid, { Column, DataGridHandle, Row } from 'react-data-grid'
 import { QueryInsightsQuery } from 'data/query-insights/query-insights-query'
 import dayjs from 'dayjs'
-import { cn } from 'ui'
+import { cn, CodeBlock } from 'ui'
 import { TextSearch } from 'lucide-react'
 import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 
@@ -19,6 +19,10 @@ export const QueryList = ({ queries, isLoading, onQuerySelect, selectedQuery }:
   const gridRef = useRef<DataGridHandle>(null)
   const [selectedRow, setSelectedRow] = useState<number | undefined>()
 
+  const normalizeWhitespace = (sql: string) => {
+    return sql.replace(/\s+/g, ' ').trim()
+  }
+
   // Update selected row when selectedQuery changes from parent
   useEffect(() => {
     if (selectedQuery) {
@@ -53,23 +57,34 @@ export const QueryList = ({ queries, isLoading, onQuerySelect, selectedQuery }:
   }
 
   const columns: Column<QueryInsightsQuery>[] = [
-    {
-      key: 'timestamp',
-      name: 'Time',
-      resizable: true,
-      minWidth: 120,
-      headerCellClass: 'first:pl-6',
-      renderCell: (props) => (
-        <div className="font-mono text-xs">{dayjs(props.row.timestamp).format('HH:mm:ss')}</div>
-      ),
-    },
+    // {
+    //   key: 'timestamp',
+    //   name: 'Time',
+    //   resizable: true,
+    //   minWidth: 120,
+    //   headerCellClass: 'first:pl-6',
+    //   renderCell: (props) => (
+    //     <div className="font-mono text-xs">{dayjs(props.row.timestamp).format('HH:mm:ss')}</div>
+    //   ),
+    // },
     {
       key: 'query',
       name: 'Query',
       resizable: true,
       minWidth: 400,
       headerCellClass: '',
-      renderCell: (props) => <div className="font-mono text-xs truncate">{props.row.query}</div>,
+      renderCell: (props) => (
+        <div className="font-mono text-xs truncate w-full overflow-hidden">
+          <CodeBlock
+            language="sql"
+            className="!bg-transparent !p-0 !m-0 !border-none !whitespace-nowrap !overflow-visible"
+            hideLineNumbers
+            hideCopy
+          >
+            {normalizeWhitespace(props.row.query)}
+          </CodeBlock>
+        </div>
+      ),
     },
     {
       key: 'calls',
@@ -117,14 +132,14 @@ export const QueryList = ({ queries, isLoading, onQuerySelect, selectedQuery }:
         <div className="font-mono text-xs text-right">{props.row.rows.toLocaleString()}</div>
       ),
     },
-    {
-      key: 'database',
-      name: 'Database',
-      resizable: true,
-      minWidth: 120,
-      headerCellClass: '',
-      renderCell: (props) => <div className="font-mono text-xs">{props.row.database}</div>,
-    },
+    // {
+    //   key: 'database',
+    //   name: 'Database',
+    //   resizable: true,
+    //   minWidth: 120,
+    //   headerCellClass: '',
+    //   renderCell: (props) => <div className="font-mono text-xs">{props.row.database}</div>,
+    // },
   ]
 
   return (