diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index e5d57a268..b84709df0 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -819,9 +819,15 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
         }
     });
 
-    $translate(['filemanager.list.menu.rename', 'filemanager.list.menu.chown', 'filemanager.list.menu.extract', 'filemanager.list.menu.download', 'filemanager.list.menu.delete' ]).then(function (tr) {
+    $translate(['filemanager.list.menu.edit', 'filemanager.list.menu.rename', 'filemanager.list.menu.chown', 'filemanager.list.menu.extract', 'filemanager.list.menu.download', 'filemanager.list.menu.delete' ]).then(function (tr) {
         $scope.menuOptions = [
             {
+                text: tr['filemanager.list.menu.edit'],
+                displayed: function ($itemScope, $event, entry) { return !entry.isDirectory && !entry.isSymbolicLink; },
+                enabled: function () { return $scope.selected.length === 1; },
+                hasBottomDivider: true,
+                click: function ($itemScope, $event, entry) { $scope.open(entry); }
+            }, {
                 text: tr['filemanager.list.menu.rename'],
                 enabled: function () { return $scope.selected.length === 1; },
                 click: function ($itemScope, $event, entry) { $scope.renameEntry.show(entry); }
diff --git a/src/translation/en.json b/src/translation/en.json
index a3fb79b6a..43f7a09bf 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -858,7 +858,7 @@
             "rename": "Rename"
         },
         "chownDialog": {
-            "title": "Change ownership for {{ fileName }}",
+            "title": "Change ownership",
             "newOwner": "New Owner",
             "change": "Change Owner",
             "recursiveCheckbox": "Change ownership recursively"
@@ -903,7 +903,8 @@
                 "chown": "Change Ownership",
                 "extract": "Extract Here",
                 "download": "Download",
-                "delete": "Delete"
+                "delete": "Delete",
+                "edit": "Edit"
             },
             "mtime": "Modified"
         },