diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx
index fca06caa..43abd5b1 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx
@@ -9,23 +9,21 @@ import { VoidCodeEditor, VoidCodeEditorProps } from '../util/inputs.js';
 
 
 export const BlockCode = ({ buttonsOnHover, ...codeEditorProps }: { buttonsOnHover?: React.ReactNode } & VoidCodeEditorProps) => {
-
 	const isSingleLine = !codeEditorProps.initValue.includes('\n')
 
 	return (
 		<>
-			<div className={`relative group w-full overflow-hidden`}>
-
+			<div className="relative group w-full overflow-hidden">
 				{buttonsOnHover === null ? null : (
-					<div className="z-[1] absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200">
-						<div className={`flex space-x-2 ${isSingleLine ? '' : 'p-2'}`}>
+					<div className={`z-[1] absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200 ${isSingleLine ? 'h-full flex items-center' : ''
+						}`}>
+						<div className={`flex space-x-1 ${isSingleLine ? 'pr-2' : 'p-2'}`}>
 							{buttonsOnHover}
 						</div>
 					</div>
 				)}
 
 				<VoidCodeEditor {...codeEditorProps} />
-
 			</div>
 		</>
 	)
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx
index fe757a96..839a6679 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx
@@ -28,7 +28,7 @@ export const Sidebar = ({ className }: { className: string }) => {
 		<div
 			// default background + text styles for sidebar
 			className={`
-				w-full h-full py-2
+				w-full h-full
 				bg-void-bg-2
 				text-void-fg-1
 			`}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index b6ba1130..94909ca5 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -422,6 +422,11 @@ const ChatBubble = ({ chatMessage, isLoading }: {
 	// edit mode state
 	const [isEditMode, setIsEditMode] = useState(false)
 
+
+	if (!chatMessage.content) { // don't show if empty
+		return null
+	}
+
 	let chatbubbleContents: React.ReactNode
 
 	if (role === 'user') {