diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 14fca6f14829cfab7344d06af04115e22634a481..aa66a57a7b5e994eb0d04041761eb1a62c770306 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -200,7 +200,11 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
 
 
 FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename);
+	var dir = $('#dir').val()
+	if (dir !== '/') {
+		dir = dir + '/';
+	}
+	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename);
 });
 
 FileActions.setDefault('dir', 'Open');