diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx
index 45b293381b..49fc4393ce 100644
--- a/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx
@@ -1,5 +1,5 @@
+import { CustomTooltip } from '@remix-ui/helper'
 import React, { useState, useEffect } from 'react' //eslint-disable-line
-import { OverlayTrigger, Tooltip } from 'react-bootstrap'
 import { Placement } from 'react-bootstrap/esm/Overlay'
 import { FileExplorerMenuProps } from '../types'
 const _paq = window._paq = window._paq || []
@@ -53,27 +53,23 @@ export const FileExplorerMenu = (props: FileExplorerMenuProps) => {
 
   return (
     <>
-      <OverlayTrigger
+      <CustomTooltip
         placement="top-start"
-        overlay={
-          <Tooltip id="remixuilabelTooltip" className="text-nowrap">
-            <span>{props.title}</span>
-          </Tooltip>
-        }
+        tooltipId="remixuilabelTooltip"
+        tooltipClasses="text-nowrap"
+        tooltipText={props.title}
       >
         <span className='remixui_label' data-path={props.title} style={{ fontWeight: 'bold' }}>{ props.title }</span>
-      </OverlayTrigger>
+      </CustomTooltip>
       <span className="pl-2">{
         state.menuItems.map(({ action, title, icon, placement }, index) => {
           if (action === 'uploadFile') {
             return (
-              <OverlayTrigger
+              <CustomTooltip
                 placement="right"
-                overlay={
-                  <Tooltip id="uploadFileTooltip" className="text-nowrap">
-                    <span>{title}</span>
-                  </Tooltip>
-                }
+                tooltipId="uploadFileTooltip"
+                tooltipClasses="text-nowrap"
+                tooltipText={title}
               >
                 <label
                   id={action}
@@ -88,17 +84,15 @@ export const FileExplorerMenu = (props: FileExplorerMenuProps) => {
                     }}
                     multiple />
                 </label>
-              </OverlayTrigger>
+              </CustomTooltip>
             )
           } else {
             return (
-              <OverlayTrigger
+              <CustomTooltip
                 placement={placement as Placement}
-                overlay={
-                  <Tooltip id={`${action}-${title}-${icon}-${index}`} className="text-nowrap">
-                    <span>{title}</span>
-                  </Tooltip>
-                }
+                tooltipId={`${action}-${title}-${icon}-${index}`}
+                tooltipClasses="text-nowrap"
+                tooltipText={title}
               >
                 <span
                   id={action}
@@ -120,7 +114,7 @@ export const FileExplorerMenu = (props: FileExplorerMenuProps) => {
                   key={`${action}-${title}-${index}`}
                 >
                 </span>
-              </OverlayTrigger>
+              </CustomTooltip>
             )
           }
         })}
diff --git a/libs/remix-ui/workspace/src/lib/components/file-label.tsx b/libs/remix-ui/workspace/src/lib/components/file-label.tsx
index 94d53f8a8c..49563979ea 100644
--- a/libs/remix-ui/workspace/src/lib/components/file-label.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/file-label.tsx
@@ -1,5 +1,6 @@
 // eslint-disable-next-line no-use-before-define
 import { fileDecoration } from '@remix-ui/file-decorators'
+import { CustomTooltip } from '@remix-ui/helper'
 import React, { useEffect, useRef, useState } from 'react'
 import { FileType } from '../types'
 
@@ -70,13 +71,19 @@ export const FileLabel = (props: FileLabelProps) => {
       onKeyDown={handleEditInput}
       onBlur={handleEditBlur}
     >
-      <span
-        title={file.path}
-        className={`text-nowrap remixui_label ${fileStateClasses} ` + (file.isDirectory ? 'folder' : 'remixui_leaf')}
-        data-path={file.path}
+      <CustomTooltip
+        placement="right-start"
+        tooltipText={file.path}
+        tooltipClasses="text-nowrap"
+        tooltipId="fileLabelTooltip"
       >
-        {file.name}
-      </span>
+        <span
+          className={`text-nowrap remixui_label ${fileStateClasses} ` + (file.isDirectory ? 'folder' : 'remixui_leaf')}
+          data-path={file.path}
+        >
+          {file.name}
+        </span>
+      </CustomTooltip>
     </div>
   )
 }