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 15b3a995e4..a411e7b2f8 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -409,7 +409,7 @@ class DirentListItem extends React.Component {
                 <img src={`${siteRoot}${dirent.encoded_thumbnail_src}`} className="thumbnail" alt="" /> :
                 <img src={iconUrl} width="24" alt='' />
               }
-              {dirent.is_locked && <img className="locked" src={mediaUrl + 'img/file-locked-32.png'} alt={gettext('locked')} />}
+              {dirent.is_locked && <img className="locked" src={mediaUrl + 'img/file-locked-32.png'} alt={gettext('locked')} title={dirent.lock_owner}/>}
             </div>
           </td>
           <td className="name">
diff --git a/frontend/src/components/dirent-list-view/dirent-menu.js b/frontend/src/components/dirent-list-view/dirent-menu.js
index 56cbe4c70e..3767c4919c 100644
--- a/frontend/src/components/dirent-list-view/dirent-menu.js
+++ b/frontend/src/components/dirent-list-view/dirent-menu.js
@@ -55,8 +55,10 @@ class DirentMenu extends React.Component {
       }
       menuList.push('Copy');
       if (isPro) {
-        if (dirent.is_locked && dirent.locked_by_me) {
-          menuList.push('Unlock');
+        if (dirent.is_locked) {
+          if (dirent.locked_by_me || (dirent.lock_owner === "OnlineOffice" && permission === 'rw')) {
+            menuList.push('Unlock');
+          }
         } else {
           menuList.push('Lock');
         }