diff --git a/src/pods/properties/components/icon-selector/modal/icon-modal.tsx b/src/pods/properties/components/icon-selector/modal/icon-modal.tsx
index 997930fb..90b9478c 100644
--- a/src/pods/properties/components/icon-selector/modal/icon-modal.tsx
+++ b/src/pods/properties/components/icon-selector/modal/icon-modal.tsx
@@ -5,6 +5,8 @@ import { useIconModal } from './use-icon-modal.hook';
 import { IconModalSearchBar } from './components/searchbar.component';
 import { IconModalCategories } from './components/categories.component';
 import { IconList } from './components/icon-list.component';
+import { useEffect } from 'react';
+import { useCanvasContext } from '@/core/providers';
 
 interface IconModalProps {
   actualIcon: IconInfo;
@@ -13,6 +15,7 @@ interface IconModalProps {
 
 export const IconModal: React.FC<IconModalProps> = props => {
   const { actualIcon, onChange } = props;
+  const { setIsInlineEditing } = useCanvasContext();
   const { closeModal } = useModalDialogContext();
 
   const {
@@ -33,6 +36,14 @@ export const IconModal: React.FC<IconModalProps> = props => {
     closeModal();
   };
 
+  useEffect(() => {
+    setIsInlineEditing(true);
+
+    return () => {
+      setIsInlineEditing(false);
+    };
+  }, []);
+
   return (
     <div className={classes.container}>
       <h2 className={classes.title}>Choose your icon</h2>