diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
index 093bb735a..c3abf01c9 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
@@ -507,6 +507,10 @@ 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;
+
     return (
         <Fragment>
             <List>
@@ -537,7 +541,8 @@ const EditShape = props => {
                 }}></ListItem>
             </List>
             <List>
-                <ListButton title={_t.textRemoveShape} onClick={() => {props.onRemoveShape()}} className='button-red button-fill button-raised'/>
+                <ListButton title={_t.textRemoveShape} onClick={() => {props.onRemoveShape()}} 
+                className={`button-red button-fill button-raised ${setDisabled ? 'disabled' : ''}`} />
             </List>
         </Fragment>
     )
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
index f4fcb7c19..67540141e 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
@@ -11,6 +11,7 @@ const EditShape = props => {
     const storeFocusObjects = props.storeFocusObjects;
     const shapeObject = storeFocusObjects.shapeObject;
     const canFill = shapeObject && shapeObject.get_ShapeProperties().asc_getCanFill();
+    let setDisabled = true;
 
     return (
         <Fragment>