diff --git a/lib/ace/mode/behaviour/xml.js b/lib/ace/mode/behaviour/xml.js
index bd0574c6..eaa570ed 100644
--- a/lib/ace/mode/behaviour/xml.js
+++ b/lib/ace/mode/behaviour/xml.js
@@ -150,15 +150,33 @@ var XmlBehaviour = function () {
         if (text == "\n") {
             var cursor = editor.getCursorPosition();
             var line = session.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var next_indent = this.$getIndent(line);
-                var indent = next_indent + session.getTabString();
+            var iterator = new TokenIterator(session, cursor.row, cursor.column);
+            var token = iterator.getCurrentToken();
+            
+            if (token && token.type.indexOf('tag-close') !== -1) {
+                //get tag name
+                while (token && token.type.indexOf('tag-name') === -1) {
+                    token = iterator.stepBackward();
+                }
+    
+                var single_tags = ['!doctype','area','base','br','hr','input','img','link','meta'];
 
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
+                if (token && token.value && single_tags.indexOf(token.value) === -1) {
+                    var nextToken = session.getTokenAt(cursor.row, cursor.column+1);
+                    var next_indent = this.$getIndent(line);
+                    var indent = next_indent + session.getTabString();
+    
+                    if (nextToken && nextToken.value === '</') {
+                        return {
+                            text: '\n' + indent + '\n' + next_indent,
+                            selection: [1, indent.length, 1, indent.length]
+                        };
+                    }else{
+                        return {
+                            text: '\n' + indent
+                        };
+                    }
+                }
             }
         }
     });