diff --git a/frontend/src/components/dialog/delete-dialog.js b/frontend/src/components/dialog/delete-dialog.js
index 4e8bb6df80..e15b6e335e 100644
--- a/frontend/src/components/dialog/delete-dialog.js
+++ b/frontend/src/components/dialog/delete-dialog.js
@@ -16,16 +16,21 @@ class Delete extends React.Component {
   }
   
   render() {
-    let name = this.props.currentNode.object.name;
+    let currentNode = this.props.currentNode;
+    let name = currentNode.object.name;
+    let title = gettext('Delete File');
+    if (currentNode.object.isDir()) {
+      title = gettext('Delete Folder');
+    }
     return (
       <Modal isOpen={true} toggle={this.toggle}>
-        <ModalHeader toggle={this.toggle}>{gettext('Delete Tag')}</ModalHeader>
+        <ModalHeader toggle={this.toggle}>{title}</ModalHeader>
         <ModalBody>
           <p>{gettext('Are you sure to delete')}{' '}<b>{name}</b> ?</p>
         </ModalBody>
         <ModalFooter>
-          <Button outline color="danger" onClick={this.props.handleSubmit}>{gettext('YES')}</Button>
-          <Button outline color="secondary" onClick={this.toggle}>{gettext('NO')}</Button>
+          <Button outline color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+          <Button outline color="danger" onClick={this.props.handleSubmit}>{gettext('Delete')}</Button>
         </ModalFooter>
       </Modal>
     );
diff --git a/frontend/src/components/dialog/rename-dialog.js b/frontend/src/components/dialog/rename-dialog.js
index 986633e57b..ede8464535 100644
--- a/frontend/src/components/dialog/rename-dialog.js
+++ b/frontend/src/components/dialog/rename-dialog.js
@@ -107,13 +107,13 @@ class Rename extends React.Component {
       <Modal isOpen={true} toggle={this.toggle}>
         <ModalHeader toggle={this.toggle}>{type === 'file' ? gettext('Rename File') : gettext('Rename Folder') }</ModalHeader>
         <ModalBody>
-          <p>{type === 'file' ? gettext('Enter the new file name:'): gettext('Enter the new folder name:')}</p>
+          <p>{type === 'file' ? gettext('New file name'): gettext('New folder name')}</p>
           <Input onKeyPress={this.handleKeyPress} innerRef={input => {this.newInput = input;}} placeholder="newName" value={this.state.newName} onChange={this.handleChange} />
           {this.state.errMessage && <Alert color="danger" className="mt-2">{this.state.errMessage}</Alert>}
         </ModalBody>
         <ModalFooter>
-          <Button color="primary" onClick={this.handleSubmit}>{gettext('Submit')}</Button>
           <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+          <Button color="primary" onClick={this.handleSubmit}>{gettext('Submit')}</Button>
         </ModalFooter>
       </Modal>
     );