diff --git a/demo/demo.js b/demo/demo.js
index f950a1d9..3e342ae4 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -59,6 +59,7 @@ exports.launch = function(env) {
     var CCPPMode = require("ace/mode/c_cpp").Mode;
     var CoffeeMode = require("ace/mode/coffee").Mode;
     var PerlMode = require("ace/mode/perl").Mode;
+    var TextileMode = require("ace/mode/textile").Mode;
     var TextMode = require("ace/mode/text").Mode;
     var UndoManager = require("ace/undomanager").UndoManager;
 
@@ -134,11 +135,16 @@ exports.launch = function(env) {
     docs.perl.setMode(new PerlMode());
     docs.perl.setUndoManager(new UndoManager());
 
+    docs.textile = new EditSession(document.getElementById("textiletext").innerHTML);
+    docs.textile.setMode(new TextileMode());
+    docs.textile.setUndoManager(new UndoManager());
+
     var container = document.getElementById("editor");
     env.editor = new Editor(new Renderer(container, theme));
 
     var modes = {
         text: new TextMode(),
+        textile: new TextileMode(),
         xml: new XmlMode(),
         html: new HtmlMode(),
         css: new CssMode(),
@@ -201,6 +207,9 @@ exports.launch = function(env) {
         else if (mode instanceof CSharpMode) {
             modeEl.value = "csharp";
         }
+        else if (mode instanceof TextileMode) {
+            modeEl.value = "textile";
+        }
         else {
             modeEl.value = "text";
         }
diff --git a/index.html b/index.html
index f9ce77e6..cea626a3 100644
--- a/index.html
+++ b/index.html
@@ -25,7 +25,7 @@
           <option value="java">Java Document</option>
           <option value="csharp">C# Document</option>
           <option value="c_cpp">C++ Document</option>
-          <option value="textile" selected>Textile Document</option>
+          <option value="textile">Textile Document</option>
           <option value="plain">Text Document</option>
         </select>
       </td>
@@ -319,9 +319,7 @@ print "\n";
 
 </script>
 
-<script type="text/editor" id="textile">
-
-h1. Textile document
+<script type="text/editor" id="textiletext">h1. Textile document
 
 h2. Heading Two
 
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index b204a8f8..523f3941 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -116,6 +116,7 @@ var Editor =function(renderer, session) {
     }
 
     this.setSession = function(session) {
+        if (!session) debugger
         if (this.session == session) return;
 
         if (this.session) {