diff --git a/lib/ace/mode/behaviour/html.js b/lib/ace/mode/behaviour/html.js
index 89cdedfa..6c009ada 100644
--- a/lib/ace/mode/behaviour/html.js
+++ b/lib/ace/mode/behaviour/html.js
@@ -43,7 +43,7 @@ var oop = require("../../lib/oop");
 var XmlBehaviour = require("../behaviour/xml").XmlBehaviour;
 var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
 var TokenIterator = require("../../token_iterator").TokenIterator;
-var selfClosers = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'iframe', 'img', 'input', 'keygen', 'link', 'map', 'meta', 'param', 'source', 'track'];
+var voidElements = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
 function hasType(token, type) {
     var hasType = true;
@@ -78,15 +78,15 @@ var HtmlBehaviour = function () {
             if (!token || !hasType(token, 'meta.tag-name') || iterator.stepBackward().value.match('/')) {
                 return
             }
-            var tag = token.value;
+            var element = token.value;
             if (atCursor){
-                var tag = tag.substring(0, position.column - token.start);
+                var element = element.substring(0, position.column - token.start);
             }
-            if (selfClosers.indexOf(tag) !== -1){
+            if (voidElements.indexOf(element) !== -1){
                 return;
             }
             return {
-               text: '>' + '</' + tag + '>',
+               text: '>' + '</' + element + '>',
                selection: [1, 1]
             }
         }