diff --git a/frontend/src/Editor/ConfigHandle.jsx b/frontend/src/Editor/ConfigHandle.jsx
index f38c2492e4..8c1411a560 100644
--- a/frontend/src/Editor/ConfigHandle.jsx
+++ b/frontend/src/Editor/ConfigHandle.jsx
@@ -13,6 +13,7 @@ export const ConfigHandle = function ConfigHandle({
   customClassName = '',
   configWidgetHandlerForModalComponent = false,
   isVersionReleased,
+  showHandle,
 }) {
   return (
     <div
@@ -20,6 +21,7 @@ export const ConfigHandle = function ConfigHandle({
       ref={dragRef}
       style={{
         top: position === 'top' ? '-20px' : widgetTop + widgetHeight - 10,
+        visibility: showHandle ? 'visible' : 'hidden',
       }}
     >
       <span
diff --git a/frontend/src/Editor/DraggableBox.jsx b/frontend/src/Editor/DraggableBox.jsx
index c8ed692ab0..1350a219ba 100644
--- a/frontend/src/Editor/DraggableBox.jsx
+++ b/frontend/src/Editor/DraggableBox.jsx
@@ -211,7 +211,7 @@ export const DraggableBox = React.memo(
       <div
         className={
           inCanvas
-            ? ''
+            ? 'widget-in-canvas'
             : cx('text-center align-items-center clearfix draggable-box-wrapper', {
                 '': component.component !== 'KanbanBoard',
                 'd-none': component.component === 'KanbanBoard',
@@ -237,21 +237,21 @@ export const DraggableBox = React.memo(
             style={getStyles(isDragging, isSelectedComponent)}
           >
             <div ref={preview} role="DraggableBox" style={isResizing ? { opacity: 0.5 } : { opacity: 1 }}>
-              {mode === 'edit' &&
-                !readOnly &&
-                (configWidgetHandlerForModalComponent || mouseOver || isSelectedComponent) &&
-                !isResizing && (
-                  <ConfigHandle
-                    id={id}
-                    removeComponent={removeComponent}
-                    component={component}
-                    position={layoutData.top < 15 ? 'bottom' : 'top'}
-                    widgetTop={layoutData.top}
-                    widgetHeight={layoutData.height}
-                    isMultipleComponentsSelected={isMultipleComponentsSelected}
-                    configWidgetHandlerForModalComponent={configWidgetHandlerForModalComponent}
-                  />
-                )}
+              {mode === 'edit' && !readOnly && (
+                <ConfigHandle
+                  id={id}
+                  removeComponent={removeComponent}
+                  component={component}
+                  position={layoutData.top < 15 ? 'bottom' : 'top'}
+                  widgetTop={layoutData.top}
+                  widgetHeight={layoutData.height}
+                  isMultipleComponentsSelected={isMultipleComponentsSelected}
+                  configWidgetHandlerForModalComponent={configWidgetHandlerForModalComponent}
+                  mouseOver={mouseOver}
+                  isSelectedComponent={isSelectedComponent}
+                  showHandle={(configWidgetHandlerForModalComponent || mouseOver || isSelectedComponent) && !isResizing}
+                />
+              )}
               <Sentry.ErrorBoundary
                 fallback={<h2>Something went wrong.</h2>}
                 beforeCapture={(scope) => {
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index 69348ec143..6d0625ef89 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -2614,6 +2614,20 @@ hr {
   z-index: 3 !important;
 }
 
+.config-handle:hover,
+.widget-in-canvas:hover .config-handle{
+  visibility: visible;
+}
+
+.config-handle{
+  visibility: hidden;
+  transition: all .1s ease-in-out;
+}
+
+.canvas-area .modal .config-handle{
+  visibility: visible !important;
+}
+
 .modal-content {
   .config-handle {
     position: absolute;