diff --git a/src/lib/components/chat/Messages/ContentRenderer.svelte b/src/lib/components/chat/Messages/ContentRenderer.svelte
index 21203bed8..21fb11d3a 100644
--- a/src/lib/components/chat/Messages/ContentRenderer.svelte
+++ b/src/lib/components/chat/Messages/ContentRenderer.svelte
@@ -84,7 +84,12 @@
 		}
 
 		if (floatingButtonsElement) {
-			floatingButtonsElement.closeHandler();
+			// check if closeHandler is defined
+
+			if (typeof floatingButtonsElement?.closeHandler === 'function') {
+				// call the closeHandler function
+				floatingButtonsElement?.closeHandler();
+			}
 		}
 	};
 
diff --git a/src/lib/components/common/Collapsible.svelte b/src/lib/components/common/Collapsible.svelte
index 84d6728fe..9e7fc36bb 100644
--- a/src/lib/components/common/Collapsible.svelte
+++ b/src/lib/components/common/Collapsible.svelte
@@ -52,6 +52,22 @@
 
 	export let disabled = false;
 	export let hide = false;
+
+	function formatJSONString(obj) {
+		try {
+			const parsed = JSON.parse(obj);
+			// If parsed is an object/array, then it's valid JSON
+			if (typeof parsed === 'object') {
+				return JSON.stringify(parsed, null, 2);
+			} else {
+				// It's a primitive value like a number, boolean, etc.
+				return String(parsed);
+			}
+		} catch (e) {
+			// Not valid JSON, return as-is
+			return obj;
+		}
+	}
 </script>
 
 <div {id} class={className}>
@@ -176,19 +192,22 @@
 		{#if open && !hide}
 			<div transition:slide={{ duration: 300, easing: quintOut, axis: 'y' }}>
 				{#if attributes?.type === 'tool_calls'}
+					{@const args = JSON.parse(decode(attributes?.arguments))}
+					{@const result = JSON.parse(decode(attributes?.result ?? ''))}
+
 					{#if attributes?.done === 'true'}
 						<Markdown
 							id={`tool-calls-${attributes?.id}-result`}
 							content={`> \`\`\`json
-> ${JSON.stringify(JSON.parse(JSON.parse(decode(attributes?.arguments))), null, 2)}
-> ${JSON.stringify(JSON.parse(JSON.parse(decode(attributes?.result))), null, 2)}
+> ${formatJSONString(args)}
+> ${formatJSONString(result)}
 > \`\`\``}
 						/>
 					{:else}
 						<Markdown
 							id={`tool-calls-${attributes?.id}-result`}
 							content={`> \`\`\`json
-> ${JSON.stringify(JSON.parse(JSON.parse(decode(attributes?.arguments))), null, 2)}
+> ${formatJSONString(args)}
 > \`\`\``}
 						/>
 					{/if}