diff --git a/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/EditIcons/index.js b/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/EditIcons/index.js
index 88639dc19c7..7e9cb4fd9ee 100644
--- a/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/EditIcons/index.js
+++ b/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/EditIcons/index.js
@@ -19,7 +19,6 @@ const handleClick = func => e => {
 
 function EditIcons({
   className,
-  hovering,
   onDelete,
   onEdit,
   onCreateFile,
@@ -35,46 +34,44 @@ function EditIcons({
   }
 
   return (
-    <div className={className}>
-      {(hovering || (window.__isTouch && active) || forceShow) && (
-        <Container>
-          {onEdit && (
-            <Tooltip title="Rename">
-              <Icon onClick={handleClick(onEdit)}>
-                <EditIcon />
-              </Icon>
-            </Tooltip>
-          )}
-          {onUploadFile && (
-            <Tooltip title="Upload Files">
-              <Icon onClick={handleClick(onUploadFile)}>
-                <UploadFileIcon />
-              </Icon>
-            </Tooltip>
-          )}
-          {onCreateFile && (
-            <Tooltip title="New File">
-              <Icon onClick={handleClick(onCreateFile)}>
-                <AddFileIcon />
-              </Icon>
-            </Tooltip>
-          )}
-          {onCreateDirectory && (
-            <Tooltip title="New Directory">
-              <Icon onClick={handleClick(onCreateDirectory)}>
-                <AddDirectoryIcon />
-              </Icon>
-            </Tooltip>
-          )}
-          {onDelete && (
-            <Tooltip title="Delete">
-              <Icon onClick={handleClick(onDelete)}>
-                <CrossIcon />
-              </Icon>
-            </Tooltip>
-          )}
-        </Container>
-      )}
+    <div className={className} style={{ pointerEvents: 'none' }}>
+      <Container>
+        {onEdit && (
+          <Tooltip title="Rename">
+            <Icon onClick={handleClick(onEdit)}>
+              <EditIcon style={{ pointerEvents: 'auto' }} />
+            </Icon>
+          </Tooltip>
+        )}
+        {onUploadFile && (
+          <Tooltip title="Upload Files">
+            <Icon onClick={handleClick(onUploadFile)}>
+              <UploadFileIcon style={{ pointerEvents: 'auto' }} />
+            </Icon>
+          </Tooltip>
+        )}
+        {onCreateFile && (
+          <Tooltip title="New File">
+            <Icon onClick={handleClick(onCreateFile)}>
+              <AddFileIcon style={{ pointerEvents: 'auto' }} />
+            </Icon>
+          </Tooltip>
+        )}
+        {onCreateDirectory && (
+          <Tooltip title="New Directory">
+            <Icon onClick={handleClick(onCreateDirectory)}>
+              <AddDirectoryIcon style={{ pointerEvents: 'auto' }} />
+            </Icon>
+          </Tooltip>
+        )}
+        {onDelete && (
+          <Tooltip title="Delete">
+            <Icon onClick={handleClick(onDelete)}>
+              <CrossIcon style={{ pointerEvents: 'auto' }} />
+            </Icon>
+          </Tooltip>
+        )}
+      </Container>
     </div>
   );
 }
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/index.js b/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/index.js
index 0072a76fb0e..8d75738f85b 100644
--- a/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/index.js
+++ b/packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/index.js
@@ -25,7 +25,6 @@ class Entry extends React.PureComponent {
       state: props.state || '',
       error: false,
       selected: false,
-      hovering: false,
     };
   }
 
@@ -76,9 +75,6 @@ class Entry extends React.PureComponent {
 
   setCurrentModule = () => this.props.setCurrentModule(this.props.id);
 
-  onMouseEnter = () => this.setState({ hovering: true });
-  onMouseLeave = () => this.setState({ hovering: false });
-
   render() {
     const {
       title,
@@ -102,7 +98,7 @@ class Entry extends React.PureComponent {
       root,
       rightColors,
     } = this.props;
-    const { state, error, selected, hovering } = this.state;
+    const { state, error, selected } = this.state;
 
     const items = [
       [
@@ -151,8 +147,6 @@ class Entry extends React.PureComponent {
             nameValidationError={error}
             active={active}
             editing={state === 'editing' || selected}
-            onMouseEnter={this.onMouseEnter}
-            onMouseLeave={this.onMouseLeave}
             alternative={isMainModule}
             rightColors={rightColors}
             noTransition
@@ -179,10 +173,10 @@ class Entry extends React.PureComponent {
             {state === '' && (
               <Right>
                 {isMainModule ? (
-                  <span style={{ opacity: hovering ? 1 : 0 }}>main</span>
+                  <span className="mainIndicator">main</span>
                 ) : (
                   <EditIcons
-                    hovering={hovering}
+                    className="actionIcons"
                     onCreateFile={onCreateModuleClick}
                     onCreateDirectory={onCreateDirectoryClick}
                     onUploadFile={onUploadFileClick}
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Workspace/elements.js b/packages/app/src/app/pages/Sandbox/Editor/Workspace/elements.js
index 410ab2eda7e..1e2159a65f7 100644
--- a/packages/app/src/app/pages/Sandbox/Editor/Workspace/elements.js
+++ b/packages/app/src/app/pages/Sandbox/Editor/Workspace/elements.js
@@ -78,6 +78,19 @@ export const getContainerStyles = props => {
 
 export const EntryContainer = styled.span`
   ${props => getContainerStyles(props)};
+  .actionIcons,
+  .mainIndicator {
+    opacity: 0;
+  }
+
+  .actionIcons {
+    transition: opacity 0.2s;
+  }
+
+  &:hover .mainIndicator,
+  &:hover .actionIcons {
+    opacity: 1;
+  }
 `;
 
 export const Container = styled.div`