diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/ChangesContent.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/ChangesContent.tsx
index f6c475c44f2..0ea220ba548 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/ChangesContent.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/ChangesContent.tsx
@@ -133,28 +133,26 @@ export function ChangesContent() {
 
 	return (
 		<>
-			<div className="flex-1 h-full flex flex-col bg-tertiary rounded-lg">
-				<div className="flex flex-col h-full bg-background m-2 rounded-lg overflow-hidden">
-					<FileHeader file={selectedFile} worktreePath={worktreePath} />
-					<DiffToolbar
+			<div className="flex flex-col h-full overflow-hidden">
+				<FileHeader file={selectedFile} worktreePath={worktreePath} />
+				<DiffToolbar
+					viewMode={viewMode}
+					onViewModeChange={setViewMode}
+					category={selectedCategory}
+					onStage={isUnstaged ? stage : undefined}
+					onUnstage={isStaged ? unstage : undefined}
+					onDiscard={isUnstaged ? handleDiscard : undefined}
+					isActioning={isPending}
+					isEditable={isEditable}
+					isSaving={saveFileMutation.isPending}
+				/>
+				<div className="flex-1">
+					<DiffViewer
+						contents={contents}
 						viewMode={viewMode}
-						onViewModeChange={setViewMode}
-						category={selectedCategory}
-						onStage={isUnstaged ? stage : undefined}
-						onUnstage={isStaged ? unstage : undefined}
-						onDiscard={isUnstaged ? handleDiscard : undefined}
-						isActioning={isPending}
-						isEditable={isEditable}
-						isSaving={saveFileMutation.isPending}
+						editable={isEditable}
+						onSave={handleSave}
 					/>
-					<div className="flex-1">
-						<DiffViewer
-							contents={contents}
-							viewMode={viewMode}
-							editable={isEditable}
-							onSave={handleSave}
-						/>
-					</div>
 				</div>
 			</div>
 
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/components/EmptyState/EmptyState.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/components/EmptyState/EmptyState.tsx
index 24adcd3eb20..f2975b6e659 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/components/EmptyState/EmptyState.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/components/EmptyState/EmptyState.tsx
@@ -7,7 +7,7 @@ interface EmptyStateProps {
 
 export function EmptyState({ title, description }: EmptyStateProps) {
 	return (
-		<div className="flex-1 flex flex-col items-center justify-center text-muted-foreground px-4">
+		<div className="flex-1 flex flex-col items-center justify-center text-muted-foreground px-4 h-full">
 			<HiOutlineDocumentMagnifyingGlass className="w-12 h-12 mb-4 opacity-50" />
 			<h3 className="text-lg font-medium mb-1">{title}</h3>
 			{description && (
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/index.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/index.tsx
index b2419a30248..e04866eb656 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/index.tsx
@@ -20,16 +20,8 @@ export function TabsContent() {
 	}, [activeWorkspaceId, activeTabIds, allTabs]);
 
 	if (!tabToRender) {
-		return (
-			<div className="flex-1 h-full">
-				<EmptyTabView />
-			</div>
-		);
+		return <EmptyTabView />;
 	}
 
-	return (
-		<div className="flex-1 h-full">
-			<TabView tab={tabToRender} panes={panes} />
-		</div>
-	);
+	return <TabView tab={tabToRender} panes={panes} />;
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/index.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/index.tsx
index 5a42abde6be..0d6313fb47b 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/index.tsx
@@ -6,7 +6,13 @@ export function ContentView() {
 	const { currentMode } = useSidebarStore();
 
 	if (currentMode === SidebarMode.Changes) {
-		return <ChangesContent />;
+		return (
+			<div className="h-full p-1 bg-tertiary">
+				<div className="h-full bg-background rounded-lg">
+					<ChangesContent />
+				</div>
+			</div>
+		);
 	}
 
 	return <TabsContent />;