diff --git a/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee b/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee
index ff57648aec..75088c4078 100644
--- a/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee
+++ b/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee
@@ -272,9 +272,10 @@ define [
 
 		renameEntity: (entity, name, callback = (error) ->) ->
 			return if entity.name == name
-			entity.name = name
+			if name.length < 150
+				entity.name = name
 			return @ide.$http.post "/project/#{@ide.project_id}/#{entity.type}/#{entity.id}/rename", {
-				name: name,
+				name: entity.name,
 				_csrf: window.csrfToken
 			}
 
diff --git a/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee b/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee
index 2285f8f029..01f441b603 100644
--- a/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee
+++ b/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee
@@ -12,8 +12,10 @@ define [
 			$scope.$emit "project:rename:start"
 
 		$scope.finishRenaming = () ->
-			$scope.project.name = $scope.inputs.name
-			settings.saveProjectSettings({name: $scope.inputs.name})
+			newName = $scope.inputs.name
+			if newName.length < 150
+				$scope.project.name = newName
+			settings.saveProjectSettings({name: $scope.project.name})
 			$scope.state.renaming = false
 
 		ide.socket.on "projectNameUpdated", (name) ->
diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee
index aa7879d65e..2b173ace71 100644
--- a/services/web/public/coffee/main/project-list/project-list.coffee
+++ b/services/web/public/coffee/main/project-list/project-list.coffee
@@ -257,9 +257,10 @@ define [
 				window.location = "/project/#{project_id}"
 
 		$scope.renameProject = (project, newName) ->
-			project.name = newName
+			if newName.length < 150
+				project.name = newName
 			queuedHttp.post "/project/#{project.id}/rename", {
-				newProjectName: newName
+				newProjectName: project.name
 				_csrf: window.csrfToken
 			}