diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/ChangesView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/ChangesView.tsx
index 05394d38b9d..ee48af8bdb7 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/ChangesView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/ChangesView.tsx
@@ -323,7 +323,7 @@ export function ChangesView({ onFileOpen, isExpandedView }: ChangesViewProps) {
 	const prUrl = githubStatus?.pr?.url;
 
 	return (
-		<div className="flex flex-col h-full">
+		<div className="flex flex-col flex-1 min-h-0">
 			<ChangesHeader
 				onRefresh={handleRefresh}
 				viewMode={fileListViewMode}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/FilesView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/FilesView.tsx
index 6099649f6e5..4d368c302d3 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/FilesView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/FilesView.tsx
@@ -279,7 +279,7 @@ export function FilesView() {
 	}
 
 	return (
-		<div className="flex flex-col h-full">
+		<div className="flex flex-col flex-1 min-h-0">
 			<FileTreeToolbar
 				searchTerm={searchTerm}
 				onSearchChange={setSearchTerm}
@@ -291,9 +291,10 @@ export function FilesView() {
 				onToggleHiddenFiles={handleToggleHiddenFiles}
 			/>
 
-			<ContextMenu>
-				<ContextMenuTrigger asChild className="flex-1 min-h-0">
-					<div className="flex-1 min-h-0 overflow-auto">
+			<div className="flex-1 min-h-0 overflow-hidden">
+				<ContextMenu>
+					<ContextMenuTrigger asChild className="h-full">
+						<div className="h-full overflow-auto">
 						{newItemMode && newItemParentPath === worktreePath && (
 							<NewItemInput
 								mode={newItemMode}
@@ -385,18 +386,19 @@ export function FilesView() {
 							</div>
 						)}
 					</div>
-				</ContextMenuTrigger>
-				<ContextMenuContent className="w-48">
-					<ContextMenuItem onClick={() => handleNewFile(worktreePath)}>
-						<LuFile className="mr-2 size-4" />
-						New File
-					</ContextMenuItem>
-					<ContextMenuItem onClick={() => handleNewFolder(worktreePath)}>
-						<LuFolder className="mr-2 size-4" />
-						New Folder
-					</ContextMenuItem>
-				</ContextMenuContent>
-			</ContextMenu>
+					</ContextMenuTrigger>
+					<ContextMenuContent className="w-48">
+						<ContextMenuItem onClick={() => handleNewFile(worktreePath)}>
+							<LuFile className="mr-2 size-4" />
+							New File
+						</ContextMenuItem>
+						<ContextMenuItem onClick={() => handleNewFolder(worktreePath)}>
+							<LuFolder className="mr-2 size-4" />
+							New Folder
+						</ContextMenuItem>
+					</ContextMenuContent>
+				</ContextMenu>
+			</div>
 
 			<DeleteConfirmDialog
 				entry={deleteEntry}