diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 7f866f5a8..772363a80 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -378,7 +378,7 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
             $scope.renameEntry.busy = true;
 
             var oldFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.entry.fileName);
-            var newFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.newName);
+            var newFilePath = sanitize(($scope.renameEntry.newName[0] === '/' ? '' : ($scope.cwd + '/')) + $scope.renameEntry.newName);
 
             Client.filesRename($scope.appId, oldFilePath, newFilePath, function (error, result) {
                 $scope.renameEntry.busy = false;