diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f2945a444..d5903732e 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1517,9 +1517,10 @@ define([
     common.alert = function (msg, cb, force) {
         cb = cb || function () {};
         if (force !== true) { msg = fixHTML(msg); }
-        var keyHandler = listenForKeys(function (e) { // yes
+        var close = function (e) {
             findOKButton().click();
-        });
+        };
+        var keyHandler = listenForKeys(close, close);
         Alertify.alert(msg, function (ev) {
             cb(ev);
             stopListening(keyHandler);
diff --git a/www/drive/inner.html b/www/drive/inner.html
index 596b39e08..a6dc1bf93 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -16,16 +16,17 @@
         </div>
         <div id="content">
         </div>
-        <div id="treeContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
+        <div id="treeContextMenu" class="contextMenu dropdown clearfix">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
                 <li><a tabindex="-1" href="#" data-icon="fa-folder-open" class="open dropdown-item" data-localization="fc_open">Open</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-eye" class="open_ro dropdown-item" data-localization="fc_open_ro">Open (read-only)</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-pencil" class="rename editable dropdown-item" data-localization="fc_rename">Rename</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-trash" class="delete editable dropdown-item" data-localization="fc_delete">Delete</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-folder" class="newfolder editable dropdown-item" data-localization="fc_newfolder">New folder</a></li>
+                <li><a tabindex="-1" href="#" data-icon="fa-database" class="properties dropdown-item" data-localization="fc_prop">Properties</a></li>
             </ul>
         </div>
-        <div id="contentContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
+        <div id="contentContextMenu" class="contextMenu dropdown clearfix">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
                 <li><a tabindex="-1" href="#" data-icon="fa-folder" class="newfolder editable dropdown-item" data-localization="fc_newfolder">New folder</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-file-word-o" class="newdoc own editable dropdown-item" data-type="pad" data-localization="button_newpad">New pad</a></li>
@@ -34,19 +35,20 @@
                 <li><a tabindex="-1" href="#" data-icon="fa-calendar" class="newdoc own editable dropdown-item" data-type="poll" data-localization="button_newpoll">New poll</a></li>
             </ul>
         </div>
-        <div id="defaultContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
+        <div id="defaultContextMenu" class="contextMenu dropdown clearfix">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
                 <li><a tabindex="-1" href="#" data-icon="fa-folder-open" class="open dropdown-item" data-localization="fc_open">Open</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-eye" class="open_ro dropdown-item" data-localization="fc_open_ro">Open (read-only)</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-trash" class="delete dropdown-item" data-localization="fc_delete">Delete</a></li>
+                <li><a tabindex="-1" href="#" data-icon="fa-database" class="properties dropdown-item" data-localization="fc_prop">Properties</a></li>
             </ul>
         </div>
-        <div id="trashTreeContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
+        <div id="trashTreeContextMenu" class="contextMenu dropdown clearfix">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
                 <li><a tabindex="-1" href="#" data-icon="fa-trash-o" class="empty editable dropdown-item" data-localization="fc_empty">Empty the trash</a></li>
             </ul>
         </div>
-        <div id="trashContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
+        <div id="trashContextMenu" class="contextMenu dropdown clearfix">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
                 <li><a tabindex="-1" href="#" data-icon="fa-eraser" class="remove editable dropdown-item" data-localization="fc_remove">Delete permanently</a></li>
                 <li><a tabindex="-1" href="#" data-icon="fa-repeat" class="restore editable dropdown-item" data-localization="fc_restore">Restore</a></li>
diff --git a/www/drive/main.js b/www/drive/main.js
index 238a0cdea..373ee39c1 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -382,6 +382,8 @@ define([
                     }
                     hasFolder = true;
                     hide.push($menu.find('a.open_ro'));
+                    // TODO: folder properties in the future?
+                    hide.push($menu.find('a.properties'));
                 }
                 if (path && path.length > 4) {
                     hide.push($menu.find('a.restore'));
@@ -1838,6 +1840,19 @@ define([
             }
         });
 
+        var getProperties = function (el) {
+            if (!filesOp.isFile(el)) { return; }
+            var base = window.location.origin;
+            var $d = $('<div>');
+            $('<strong>').text(Messages.fc_prop).appendTo($d);
+            $('<br>').appendTo($d);
+            $('<label>', {'for': 'propLink'}).text(Messages.editShare).appendTo($d);
+            $('<input>', {'id': 'propLink', 'value': base + el}).appendTo($d);
+            $('<label>', {'for': 'propROLink'}).text(Messages.viewShare).appendTo($d);
+            $('<input>', {'id': 'propROLink', 'value': getReadOnlyUrl(base + el)}).appendTo($d);
+            return $d.html();
+        };
+
         $contextMenu.on("click", "a", function(e) {
             e.stopPropagation();
             var paths = $(this).data('paths');
@@ -1880,6 +1895,15 @@ define([
                 };
                 filesOp.createNewFolder(paths[0].path, null, onCreated);
             }
+            else if ($(this).hasClass("properties")) {
+                if (paths.length !== 1) { return; }
+                var el = filesOp.findElement(files, paths[0].path);
+                var prop = getProperties(el);
+                Cryptpad.alert('', undefined, true);
+                $('.alertify .msg').html(prop);
+                $('#propLink').click(function () { $(this).select(); });
+                $('#propROLink').click(function () { $(this).select(); });
+            }
             module.hideMenu();
         });
 
@@ -1911,6 +1935,15 @@ define([
                 paths.forEach(function (p) { pathsList.push(p.path); });
                 moveElements(pathsList, [TRASH], false, refresh);
             }
+            else if ($(this).hasClass("properties")) {
+                if (paths.length !== 1) { return; }
+                var el = filesOp.findElement(files, paths[0].path);
+                var prop = getProperties(el);
+                Cryptpad.alert('', undefined, true);
+                $('.alertify .msg').html(prop);
+                $('#propLink').click(function () { $(this).select(); });
+                $('#propROLink').click(function () { $(this).select(); });
+            }
             module.hideMenu();
         });