diff --git a/frontend/src/components/dialog/generate-share-link.js b/frontend/src/components/dialog/generate-share-link.js
index 5056efbdf8..e96e796a32 100644
--- a/frontend/src/components/dialog/generate-share-link.js
+++ b/frontend/src/components/dialog/generate-share-link.js
@@ -279,12 +279,12 @@ class GenerateShareLink extends React.Component {
           </FormGroup>
           <FormGroup check className="permission">
             <Label check>
-              <Input type="radio" name="radio1" defaultChecked={true} onChange={this.setPermission('previewAndDownload')}/>{'  '}{gettext('Preview and download')}
+              <Input type="radio" name="radio1" defaultChecked={true} onChange={() => this.setPermission('previewAndDownload')}/>{'  '}{gettext('Preview and download')}
             </Label>
           </FormGroup>
           <FormGroup check className="permission">
             <Label check>
-              <Input type="radio" name="radio1" onChange={this.setPermission('preview')} />{'  '}{gettext('Preview only')}
+              <Input type="radio" name="radio1" onChange={() => this.setPermission('preview')} />{'  '}{gettext('Preview only')}
             </Label>
           </FormGroup>
           <Label className="err-message">{gettext(this.state.errorInfo)}</Label><br />
diff --git a/frontend/src/components/dialog/move-dirent-dialog.js b/frontend/src/components/dialog/move-dirent-dialog.js
index afd6032dae..d1f9d22898 100644
--- a/frontend/src/components/dialog/move-dirent-dialog.js
+++ b/frontend/src/components/dialog/move-dirent-dialog.js
@@ -59,19 +59,19 @@ class MoveDirent extends React.Component {
       direntPaths.push(path);
     });
     
-    // copy dirents to one of them. eg: A/B, A/C -> A/B
+    // move dirents to one of them. eg: A/B, A/C -> A/B
     if (direntPaths.some(direntPath => { return direntPath === selectedPath;})) {
       this.setState({errMessage: message});
       return;
     }
 
-    // copy dirents to current path
+    // move dirents to current path
     if (selectedPath && selectedPath === this.props.path && (repo.repo_id === repoID)) {
       this.setState({errMessage: message});
       return;
     }
 
-    // copy dirents to one of their child. eg: A/B, A/D -> A/B/C
+    // move dirents to one of their child. eg: A/B, A/D -> A/B/C
     let moveDirentPath = '';
     let isChildPath = direntPaths.some(direntPath => {
       let flag = selectedPath.length > direntPath.length && selectedPath.indexOf(direntPath) > -1;
diff --git a/frontend/src/components/dir-view/dir-view.js b/frontend/src/components/dir-view/dir-view.js
index f21dea2673..55ae1d1abd 100644
--- a/frontend/src/components/dir-view/dir-view.js
+++ b/frontend/src/components/dir-view/dir-view.js
@@ -495,7 +495,7 @@ class DirView extends React.Component {
         isDirentSelected={this.state.isDirentSelected}
         isAllDirentSelected={this.state.isAllDirentSelected}
         direntList={this.state.direntList}
-        selectedDirentList={this.state.direntList}
+        selectedDirentList={this.state.selectedDirentList}
         onItemClick={this.onItemClick}
         onAddFile={this.onAddFile}
         onAddFolder={this.onAddFolder}
diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index 976da6b0a8..e2767a9389 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -287,8 +287,17 @@ class DirentListItem extends React.Component {
       let url = URLDecorator.getUrl({type: 'draft_view', repoID: repoID, filePath: draft_file_Path, draftId: draftId});
       let newWindow = window.open('draft');
       newWindow.location.href = url;
-    }).catch(() => {
-      toaster.danger('Create draft failed.');
+    }).catch((error) => {
+      if (error.response) {
+        let errMessage = 'Draft already exists.';
+        if (errMessage === error.response.data.error_msg) {
+          errMessage = gettext('Draft already exists.');
+          toaster.danger(errMessage);
+        }
+      } else {
+        let errMessage = gettext('Create draft failed');
+        toaster.danger(errMessage);
+      }
     });
     this.onItemMenuHide();
   }
diff --git a/frontend/src/models/dirent.js b/frontend/src/models/dirent.js
index 2fb1f695ea..a1c36ad772 100644
--- a/frontend/src/models/dirent.js
+++ b/frontend/src/models/dirent.js
@@ -9,7 +9,7 @@ class Dirent {
     this.type = json.type;
     this.mtime = moment.unix(json.mtime).fromNow();
     this.permission = json.permission;
-    this.isSelected = false;
+    this.isSelected = false; // is check or not
     if (json.type === 'file') {
       this.size = Utils.bytesToSize(json.size);
       this.starred = json.starred;