diff --git a/lib/atom-react.coffee b/lib/atom-react.coffee
index b16f169..40e77d3 100644
--- a/lib/atom-react.coffee
+++ b/lib/atom-react.coffee
@@ -8,7 +8,7 @@ autoCompleteTagCloseRegex = /(<\/)([^>]+)(>)/g
 jsxTagStartPattern = '(?x)((^|=|return)\\s*<([^!/?](?!.+?(</.+?>))))'
 jsxComplexAttributePattern = '(?x)\\{ [^}"\']* $|\\( [^)"\']* $'
 decreaseIndentForNextLinePattern = '(?x)
-/>\\s*(,|;)?\\s*$
+\\S+\\s*/>\\s*(,|;)?\\s*$
 | ^(?!\\s*\\?)\\s*\\S+.*</[-_\\.A-Za-z0-9]+>$'
 
 class AtomReact
@@ -252,7 +252,7 @@ class AtomReact
           options = {undo: 'skip'}
         else
           options = {}
-          
+
         editor.insertText('</' + tagName + '>', options)
         editor.setCursorBufferPosition(eventObj.newRange.end)
 
diff --git a/settings/JavaScript (JSX).cson b/settings/JavaScript (JSX).cson
index 7b1a44a..923c680 100644
--- a/settings/JavaScript (JSX).cson	
+++ b/settings/JavaScript (JSX).cson	
@@ -10,6 +10,7 @@
       | \\( [^)"\']* $'
     'decreaseIndentPattern': '(?x)
     ^\\s*(</[-_\\.A-Za-z0-9]+)
+    | ^\\s*/>\\s*(,|;)?\\s*$
     | ^ \\s* (\\s* /[*] .* [*]/ \\s*)* [}\\])]'
 
 '.source.js.jsx .tag:not(.entity.other.attribute-name, .entity.name.tag, .punctuation.definition.tag.begin, .invalid.illegal.incomplete .string, .curly)':