             target = angular.element(event.currentTarget)
 
             if event.keyCode == ENTER_KEY
+                saveInputTag()
+            else if event.keyCode == COMMA_KEY
+                removeInputLastCharacter(target)
                 saveInputTag()
             else
                 if target.val().length

            resetInput()
            hideSaveButton()

        ## Events
        $el.on "keypress", "input", (event) ->
            return if event.keyCode not in [ENTER_KEY, ESC_KEY]


LbTagLineDirective = ($rs) ->
    ENTER_KEY = 13
    COMMA_KEY = 188

    template = """
    <div class="tags-container"></div>
