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/main.js b/www/drive/main.js
index da88ee27e..373ee39c1 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1844,16 +1844,12 @@ define([
             if (!filesOp.isFile(el)) { return; }
             var base = window.location.origin;
             var $d = $('<div>');
-            $('<strong>').text('PROPERTIES').appendTo($d);
+            $('<strong>').text(Messages.fc_prop).appendTo($d);
             $('<br>').appendTo($d);
-            $('<br>').appendTo($d);
-            $('<label>', {'for': 'propLink'}).text("LINK").appendTo($d);
-            $('<br>').appendTo($d);
-            $('<input>', {'id': 'propLink', 'disabled': 'disabled', 'value': base + el}).appendTo($d);
-            $('<br>').appendTo($d);
-            $('<label>', {'for': 'propROLink'}).text("RO LINK").appendTo($d);
-            $('<br>').appendTo($d);
-            $('<input>', {'id': 'propROLink', 'disabled': 'disabled'}).val(getReadOnlyUrl(base + el)).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();
         };
 
@@ -1901,10 +1897,12 @@ define([
             }
             else if ($(this).hasClass("properties")) {
                 if (paths.length !== 1) { return; }
-                console.log(paths[0].path);
                 var el = filesOp.findElement(files, paths[0].path);
                 var prop = getProperties(el);
-                Cryptpad.alert(prop, undefined, true);
+                Cryptpad.alert('', undefined, true);
+                $('.alertify .msg').html(prop);
+                $('#propLink').click(function () { $(this).select(); });
+                $('#propROLink').click(function () { $(this).select(); });
             }
             module.hideMenu();
         });
@@ -1937,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();
         });