diff --git a/packages/react/src/Panels/EditorPanel.tsx b/packages/react/src/Panels/EditorPanel.tsx
index 789349b3b..1f6e8bace 100644
--- a/packages/react/src/Panels/EditorPanel.tsx
+++ b/packages/react/src/Panels/EditorPanel.tsx
@@ -79,7 +79,7 @@ export function EditorPanel({
           </div>
         </div>
         <FileTree
-          className="flex-grow py-2 border-r border-tk-elements-app-borderColor text-sm"
+          className="flex flex-col flex-grow py-2 border-r border-tk-elements-app-borderColor text-sm overflow-y-auto overflow-x-hidden"
           i18n={i18n}
           selectedFile={selectedFile}
           hideRoot={hideRoot ?? true}
diff --git a/packages/react/src/core/FileTree.tsx b/packages/react/src/core/FileTree.tsx
index 89b38c50d..e4a154621 100644
--- a/packages/react/src/core/FileTree.tsx
+++ b/packages/react/src/core/FileTree.tsx
@@ -125,7 +125,7 @@ export function FileTree({
         directory=""
         onFileChange={onFileChange}
         allowEditPatterns={allowEditPatterns}
-        triggerProps={{ className: 'h-full', 'data-testid': 'file-tree-root-context-menu' }}
+        triggerProps={{ className: 'h-full min-h-4', 'data-testid': 'file-tree-root-context-menu' }}
       />
     </div>
   );