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 e6573bbe57..55bf16a172 100644
--- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeEntityController.coffee
+++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeEntityController.coffee
@@ -28,6 +28,9 @@ define [
 
 		invalidModalShowing = false
 		$scope.finishRenaming = () ->
+			# avoid double events when blur and on-enter fire together
+			return if !$scope.entity.renaming
+
 			name = $scope.inputs.name
 			
 			if !name.match(new RegExp(ide.validFileRegex))