diff --git a/sparkle/src/components/markdown/CodeBlock.tsx b/sparkle/src/components/markdown/CodeBlock.tsx
index babac73234e9..34f489984ca2 100644
--- a/sparkle/src/components/markdown/CodeBlock.tsx
+++ b/sparkle/src/components/markdown/CodeBlock.tsx
@@ -125,12 +125,13 @@ export function CodeBlock({
         style={codeStyle}
         language={languageToUse}
         PreTag="div"
+        className="s-cursor-text"
       >
         {String(children).replace(/\n$/, "")}
       </SyntaxHighlighter>
     </Suspense>
   ) : (
-    <code className="s-mx-0.5 s-rounded-lg s-border s-border-border-dark s-bg-muted s-px-1.5 s-py-1 s-text-amber-600">
+    <code className="s-mx-0.5 s-cursor-text s-rounded-lg s-border s-border-border-dark s-bg-muted s-px-1.5 s-py-1 s-text-amber-600">
       {children}
     </code>
   );
diff --git a/sparkle/src/components/markdown/CodeBlockWithExtendedSupport.tsx b/sparkle/src/components/markdown/CodeBlockWithExtendedSupport.tsx
index c46d97a49a5e..bb5d89371375 100644
--- a/sparkle/src/components/markdown/CodeBlockWithExtendedSupport.tsx
+++ b/sparkle/src/components/markdown/CodeBlockWithExtendedSupport.tsx
@@ -104,7 +104,14 @@ const mermaidStyles = `
   /* Base diagram styles */
   .mermaid {
     background: ${palette.slate[50]};
+    cursor: default;
   }
+    
+  .mermaid text,
+  .mermaid .nodeLabel,
+  .mermaid .edgeLabel,
+  .mermaid .label {
+    cursor: text;
 
   /* Cluster styles */
   .mermaid .cluster rect {
diff --git a/sparkle/src/components/markdown/ContentBlockWrapper.tsx b/sparkle/src/components/markdown/ContentBlockWrapper.tsx
index 3edffe4cb38b..bb92749a9271 100644
--- a/sparkle/src/components/markdown/ContentBlockWrapper.tsx
+++ b/sparkle/src/components/markdown/ContentBlockWrapper.tsx
@@ -101,7 +101,7 @@ export function ContentBlockWrapper({
       <div className="s-sticky s-top-0 s-z-[1] s-w-full">
         <div
           id="BlockActions"
-          className="s-flex s-w-full s-justify-end s-gap-1 s-p-2"
+          className="s-absolute s-right-2 s-top-2 s-z-50 s-flex s-gap-2"
         >
           {actions && actions}
           {getContentToDownload && (
@@ -124,9 +124,7 @@ export function ContentBlockWrapper({
           )}
         </div>
       </div>
-      <div className={cn("s-z-0 -s-mt-11 s-w-full", innerClassName)}>
-        {children}
-      </div>
+      <div className={cn("s-z-0 s-w-full", innerClassName)}>{children}</div>
     </div>
   );
 }