diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer-hovericons.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer-hovericons.tsx
index 70d3c47e78..d609718500 100644
--- a/libs/remix-ui/workspace/src/lib/components/file-explorer-hovericons.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/file-explorer-hovericons.tsx
@@ -17,7 +17,7 @@ export function FileHoverIcons(props: FileHoverIconsProps) {
 
   return (
     <>
-      {(!props.hover && !props.isEditable) && <div className="d-flex flex-row align-items-center" style={{ marginLeft: '6rem' }}>
+      {(props.hover && !props.isEditable) && <div className="d-flex flex-row align-items-center" style={{ marginLeft: '6rem' }}>
         {
           props.file.isDirectory ? (
             <>
diff --git a/libs/remix-ui/workspace/src/lib/components/flat-tree.tsx b/libs/remix-ui/workspace/src/lib/components/flat-tree.tsx
index efec53e0ac..b5bcc61f4a 100644
--- a/libs/remix-ui/workspace/src/lib/components/flat-tree.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/flat-tree.tsx
@@ -217,7 +217,11 @@ export const FlatTree = (props: FlatTreeProps) => {
           </div>
           <div className="d-flex flex-row align-items-center">
             <div>
-              <FileHoverIcons file={file} />
+              <FileHoverIcons
+                file={file}
+                isEditable={focusEdit && file.path && focusEdit.element === file.path}
+                hover={hover.length > 0}
+              />
             </div> {getFileStateIcons(file)}
           </div>
           </>