diff --git a/src/index.html b/src/index.html
index 9066900..1cda18d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -545,6 +545,7 @@
 
 		<script src="lib/codemirror/lib/codemirror.js"></script>
 		<script src="lib/codemirror/addon/edit/matchbrackets.js"></script>
+		<script src="lib/codemirror/addon/edit/matchtags.js"></script>
 		<script src="lib/codemirror/addon/edit/closebrackets.js"></script>
 		<script src="lib/codemirror/addon/edit/closetag.js"></script>
 		<script src="lib/codemirror/addon/comment/comment.js"></script>
diff --git a/src/script.js b/src/script.js
index a2c7b1b..6187f58 100644
--- a/src/script.js
+++ b/src/script.js
@@ -1090,6 +1090,7 @@ runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyl
 			autoCloseBrackets: true,
 			autoCloseTags: true,
 			matchBrackets: true,
+			matchTags: options.matchTags || false,
 			tabMode: 'indent',
 			keyMap: 'sublime',
 			theme: 'monokai',
@@ -1194,7 +1195,8 @@ runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyl
 		mode: 'htmlmixed',
 		profile: 'xhtml',
 		gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-		noAutocomplete: true
+		noAutocomplete: true,
+		matchTags: { bothTags: true }
 	});
 	emmetCodeMirror(scope.cm.html);
 	scope.cm.css = initEditor(cssCode, {