diff --git a/app/modules/components/color-selector/color-selector.controller.coffee b/app/modules/components/color-selector/color-selector.controller.coffee
index a52ed21b..e183adfe 100644
--- a/app/modules/components/color-selector/color-selector.controller.coffee
+++ b/app/modules/components/color-selector/color-selector.controller.coffee
@@ -29,7 +29,7 @@ class ColorSelectorController
 
     checkIsColorRequired: () ->
         if !@.isColorRequired
-            @.colorList = _.dropRight(@.colorList);
+            @.colorList = _.dropRight(@.colorList)
 
     setColor: (color) ->
         @.color = @.initColor
@@ -49,9 +49,9 @@ class ColorSelectorController
 
     onKeyDown: (event) ->
         if event.which == 13 # ENTER
-            event.stopPropagation()
             if @.color or not @.isColorRequired
                 @.onSelectDropdownColor(@.color)
+            event.preventDefault()
 
 
 angular.module('taigaComponents').controller("ColorSelectorCtrl", ColorSelectorController)