diff --git a/frontend/src/Editor/Box.jsx b/frontend/src/Editor/Box.jsx
index f33061fa2d..05a4e58c7b 100644
--- a/frontend/src/Editor/Box.jsx
+++ b/frontend/src/Editor/Box.jsx
@@ -15,6 +15,8 @@ import { Multiselect } from './Components/Multiselect';
 import { Modal } from './Components/Modal';
 import { Chart } from './Components/Chart';
 import { Map } from './Components/Map';
+import { renderTooltip } from '../_helpers/appUtils';
+import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
 
 const AllComponents = {
   Button,
@@ -68,6 +70,10 @@ export const Box = function Box({
   const ComponentToRender = AllComponents[component.component];
 
   return (
+    <OverlayTrigger
+      placement="top"
+      overlay={(props) => renderTooltip({props, text: `${component.description}`})}
+    >
     <div style={{ ...styles, backgroundColor }} role={preview ? 'BoxPreview' : 'Box'}>
       {inCanvas ? (
         <ComponentToRender
@@ -106,5 +112,6 @@ export const Box = function Box({
         </div>
       )}
     </div>
+    </OverlayTrigger>
   );
 };