diff --git a/react_wrap.sublime-snippet b/react_wrap.sublime-snippet
index bf3642a..1860655 100644
--- a/react_wrap.sublime-snippet
+++ b/react_wrap.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
-    <content><![CDATA[${SELECTION/( +).*/$1/}<${1:Component}>
-$0${SELECTION/([ \t]+)([^\n]+)/\t$1$2/g}
-${SELECTION/( +).*/$1/}</${1/([^ ]+).*/$1/}>]]></content>
+    <content><![CDATA[${SELECTION/([ \t]*).*/$1/}<${1:Component}>
+$0${SELECTION/([ \t]*)([^\n]*)/\t$1$2/g}
+${SELECTION/([ \t]*).*/$1/}</${1/([^ ]+).*/$1/}>]]></content>
     <scope>source.js</scope>
     <description>React: wrap in a component</description>
 </snippet>