diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js
index 56e8144c2..067739616 100755
--- a/filemanager/static/filemanager/js/fileManager.js
+++ b/filemanager/static/filemanager/js/fileManager.js
@@ -1377,6 +1377,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
         $scope.newFileName = "";
     };
 
+    $scope.renameEnter = function ($event) {
+        var keyCode = $event.which || $event.keyCode;
+        if (keyCode === 13) {
+            $scope.htmlEditorLoading = false;
+            $scope.renameFile();
+        }
+    };
+
 
     $scope.renameFile = function () {
 
diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html
index e5b011acb..0e8f78ca2 100755
--- a/filemanager/templates/filemanager/index.html
+++ b/filemanager/templates/filemanager/index.html
@@ -578,7 +578,7 @@
                 <form>
                     <div class="form-group">
                         <label>{% trans "New Name" %}</label>
-                        <input ng-model="newFileName" type="text" class="form-control">
+                        <input ng-keypress="renameEnter($event)" ng-model="newFileName" type="text" class="form-control">
                         <small class="form-text text-muted">{% trans "Enter new name of file!" %}</small>
                     </div>
                 </form>
diff --git a/static/filemanager/js/fileManager.js b/static/filemanager/js/fileManager.js
index 27d971fb4..067739616 100644
--- a/static/filemanager/js/fileManager.js
+++ b/static/filemanager/js/fileManager.js
@@ -25,9 +25,9 @@ fileManager.config(['$interpolateProvider', function ($interpolateProvider) {
 
 fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $window) {
 
-    $('form').submit(function(e){
-    e.preventDefault();
-});
+    $('form').submit(function (e) {
+        e.preventDefault();
+    });
 
     $(document.body).click(function () {
         rightClickNode.style.display = "none";
@@ -865,6 +865,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
         $('#showCreateFolder').modal('show');
     };
 
+    $scope.createFolderEnter = function ($event) {
+        var keyCode = $event.which || $event.keyCode;
+        if (keyCode === 13) {
+            $scope.htmlEditorLoading = false;
+            $scope.createNewFolder();
+        }
+    };
+
     $scope.createNewFolder = function () {
 
         $scope.errorMessageFolder = true;
@@ -925,14 +933,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
         $('#showCreateFile').modal('show');
     };
 
-    $scope.createFileEnter = function($event){
-    var keyCode = $event.which || $event.keyCode;
-    if (keyCode === 13) {
-        $scope.htmlEditorLoading = false;
-        $scope.createNewFile();
-    }
+    $scope.createFileEnter = function ($event) {
+        var keyCode = $event.which || $event.keyCode;
+        if (keyCode === 13) {
+            $scope.htmlEditorLoading = false;
+            $scope.createNewFile();
+        }
 
-  };
+    };
 
     $scope.createNewFile = function () {
 
@@ -1369,6 +1377,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
         $scope.newFileName = "";
     };
 
+    $scope.renameEnter = function ($event) {
+        var keyCode = $event.which || $event.keyCode;
+        if (keyCode === 13) {
+            $scope.htmlEditorLoading = false;
+            $scope.renameFile();
+        }
+    };
+
 
     $scope.renameFile = function () {