diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
index c3abf01c90..60dff32620 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
@@ -507,9 +507,8 @@ const EditShape = props => {
     const storeShapeSettings = props.storeShapeSettings;
     const shapeObject = props.storeFocusObjects.shapeObject;
     const wrapType = storeShapeSettings.getWrapType(shapeObject);
-
-    let setDisabled = true;
-    props.storeFocusObjects.paragraphObject ? setDisabled = true : setDisabled = false;
+    
+    let disableRemove = !!props.storeFocusObjects.paragraphObject;
 
     return (
         <Fragment>
@@ -542,7 +541,7 @@ const EditShape = props => {
             </List>
             <List>
                 <ListButton title={_t.textRemoveShape} onClick={() => {props.onRemoveShape()}} 
-                className={`button-red button-fill button-raised ${setDisabled ? 'disabled' : ''}`} />
+                className={`button-red button-fill button-raised ${disableRemove ? 'disabled' : ''}`} />
             </List>
         </Fragment>
     )
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
index 67540141e3..f2e77639f2 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
@@ -11,7 +11,8 @@ const EditShape = props => {
     const storeFocusObjects = props.storeFocusObjects;
     const shapeObject = storeFocusObjects.shapeObject;
     const canFill = shapeObject && shapeObject.get_ShapeProperties().asc_getCanFill();
-    let setDisabled = true;
+
+    let disableRemove = storeFocusObjects.selections.indexOf('text') > -1;
 
     return (
         <Fragment>
@@ -37,7 +38,8 @@ const EditShape = props => {
                 }}></ListItem>
             </List>
             <List className="buttons-list">
-                <ListItem href="#" className="button button-raised button-red" onClick={props.onRemoveShape}>{_t.textRemoveShape}</ListItem>
+                <ListItem href="#" className={`button button-raised button-red 
+                ${disableRemove ? 'disabled' : ''}`} onClick={props.onRemoveShape}>{_t.textRemoveShape}</ListItem>
             </List>
         </Fragment>
     )