diff --git a/HTML/atomicity.coffee b/HTML/atomicity.coffee
index 9dee445cd..049dbe3a3 100644
--- a/HTML/atomicity.coffee
+++ b/HTML/atomicity.coffee
@@ -4,6 +4,7 @@ editor = ace.edit "editor"
 editor.setTheme "ace/theme/twilight"
 JavaScriptMode = require("ace/mode/javascript").Mode
 CoffeeMode = require("ace/mode/coffee").Mode
+HTMLMode = require("ace/mode/html").Mode
 editor.getSession().setMode new JavaScriptMode
 editor.getSession().setUseSoftTabs true
 editor.getSession().setTabSize 2
@@ -25,6 +26,8 @@ setMode = ->
     editor.getSession().setMode new JavaScriptMode
   else if /\.coffee$/.test filename
     editor.getSession().setMode new CoffeeMode
+  else if /\.html/.test filename
+    editor.getSession().setMode new HTMLMode
 saveAs = ->
   if file = Chrome.savePanel()
     filename = file
diff --git a/HTML/index.html b/HTML/index.html
index bc2c85816..9096202df 100644
--- a/HTML/index.html
+++ b/HTML/index.html
@@ -17,6 +17,7 @@
 <script src="theme-twilight.js" type="text/javascript" charset="utf-8"></script>
 <script src="mode-javascript.js" type="text/javascript" charset="utf-8"></script>
 <script src="mode-coffee.js" type="text/javascript" charset="utf-8"></script>
+<script src="mode-html.js" type="text/javascript" charset="utf-8"></script>
 <script src="underscore.js" type="text/javascript" charset="utf-8"></script>
 
 <script src="osx.js" type="text/javascript" charset="utf-8"></script>