         se.destroy()
       else
         return evt.abortKeyBinding()
-  
-  if action is 'toggle_comment' and toggleCommentSyntaxes.indexOf(syntax) is -1
+
+  if action is 'toggle_comment' and (toggleCommentSyntaxes.indexOf(syntax) is -1 or not atom.config.get 'emmet.useEmmetComments')
     return evt.abortKeyBinding()
 
   if action is 'insert_formatted_line_break_only'

    formatLineBreaks:
      type: 'boolean'
      default: true

  activate: (@state) ->
    @subscriptions = new CompositeDisposable

    @subscriptions.add atom.commands.add 'atom-text-editor', @actions

  deactivate: ->
    atom.config.transact => @subscriptions.dispose()
