diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeEntityController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeEntityController.coffee
index 2e5efd977e..9c46afc967 100644
--- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeEntityController.coffee
+++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeEntityController.coffee
@@ -13,10 +13,11 @@ define [
 			$scope.entity.renaming = true
 
 		$scope.finishRenaming = () ->
+			delete $scope.entity.renaming
 			name = $scope.inputs.name
 			if !name? or name.length == 0
+				$scope.inputs.name = $scope.entity.name
 				return
-			delete $scope.entity.renaming
 			ide.fileTreeManager.renameEntity($scope.entity, name)
 
 		$scope.$on "rename:selected", () ->