diff --git a/frontend/src/components/file-uploader/upload-list-item.js b/frontend/src/components/file-uploader/upload-list-item.js
index 79513704a4..5bdf15e629 100644
--- a/frontend/src/components/file-uploader/upload-list-item.js
+++ b/frontend/src/components/file-uploader/upload-list-item.js
@@ -39,7 +39,7 @@ class UploadListItem extends React.Component {
       <tr className="file-upload-item">
         <td className="upload-name">
           <div className="ellipsis">{item.resumableFile.relativePath}</div>
-          <div className="message err-message ml-0">{error}</div>
+          <div className="message err-message ml-0" dangerouslySetInnerHTML={{__html: error}}></div>
         </td>
         <td className="upload-progress">
           <span className="file-size">{this.formatFileSize(item.resumableFile.size)}</span>
diff --git a/frontend/src/components/toolbar/dir-operation-toolbar.js b/frontend/src/components/toolbar/dir-operation-toolbar.js
index 25f39b6264..09a95dd5ed 100644
--- a/frontend/src/components/toolbar/dir-operation-toolbar.js
+++ b/frontend/src/components/toolbar/dir-operation-toolbar.js
@@ -55,9 +55,9 @@ class DirOperationToolbar extends React.Component {
 
   toggleOperationMenu = (e) => {
     e.nativeEvent.stopImmediatePropagation();
-    let targetRect = e.target.getClientRects()[0];
-    let left = targetRect.x;
-    let top  = targetRect.y + targetRect.height;
+    let targetRect = e.target.getBoundingClientRect();
+    let left = targetRect.left;
+    let top  = targetRect.bottom;
     let style = {position: 'fixed', display: 'block', left: left, top: top};
     this.setState({operationMenuStyle: style});
   }