diff --git a/index.html b/index.html
index 412d28f..73e2675 100644
--- a/index.html
+++ b/index.html
@@ -240,6 +240,8 @@ textarea {
   <button id="text-tool-close">Close</button>
 </div>
 
+<textarea id="freeform-tool-input"></textarea>
+
 <canvas id="ascii-canvas"></canvas>
 
 <script src="https://apis.google.com/js/api.js"></script>
diff --git a/js-compiled.js b/js-compiled.js
index 2c96b58..1ef4593 100644
--- a/js-compiled.js
+++ b/js-compiled.js
@@ -130,11 +130,11 @@ function B(a, b) {
   d = d || "+";
   var g = Math.min(b.x, c.x), k = Math.min(b.y, c.y), h = Math.max(b.x, c.x), s = Math.max(b.y, c.y), t = e ? c.x : b.x;
   for (e = e ? b.y : c.y;g++ < h;) {
-    var O = new l(g, e), E = a.getContext(new l(g, e));
-    " " == d && 2 == E.m + E.j || H(a, O, d);
+    var P = new l(g, e), E = a.getContext(new l(g, e));
+    " " == d && 2 == E.m + E.j || H(a, P, d);
   }
   for (;k++ < s;) {
-    O = new l(t, k), E = a.getContext(new l(t, k)), " " == d && 2 == E.left + E.right || H(a, O, d);
+    P = new l(t, k), E = a.getContext(new l(t, k)), " " == d && 2 == E.left + E.right || H(a, P, d);
   }
   I(a, b, d);
   I(a, c, d);
@@ -184,6 +184,11 @@ M.prototype.e = function() {
 function N(a, b) {
   this.state = a;
   this.value = b;
+  f && ($("#freeform-tool-input").val(""), $("#freeform-tool-input").hide(0, function() {
+    $("#freeform-tool-input").show(0, function() {
+      $("#freeform-tool-input").focus();
+    });
+  }));
 }
 N.prototype.start = function(a) {
   I(this.state, a, this.value);
@@ -198,32 +203,33 @@ N.prototype.l = function() {
   return "crosshair";
 };
 N.prototype.e = function(a) {
+  f && (this.value = $("#freeform-tool-input").val().substr(0, 1), $("#freeform-tool-input").blur(), $("#freeform-tool-input").hide(0));
   1 == a.length && (this.value = a);
 };
-function P(a) {
+function O(a) {
   this.state = a;
   this.a = null;
 }
-P.prototype.start = function(a) {
+O.prototype.start = function(a) {
   L(this.state);
   $("#text-tool-input").val("");
   this.a = a;
   a = w(D(this.state, this.a));
   I(this.state, this.a, null == a ? "\u2009" : a);
 };
-P.prototype.move = function() {
+O.prototype.move = function() {
 };
-P.prototype.end = function() {
+O.prototype.end = function() {
   null != this.a && (this.g = this.a, this.a = null, $("#text-tool-widget").hide(0, function() {
     $("#text-tool-widget").show(0, function() {
       $("#text-tool-input").focus();
     });
   }));
 };
-P.prototype.l = function() {
+O.prototype.l = function() {
   return "pointer";
 };
-P.prototype.e = function() {
+O.prototype.e = function() {
   var a = $("#text-tool-input").val();
   K(this.state);
   for (var b = 0, c = 0, e = 0;e < a.length;e++) {
@@ -471,7 +477,7 @@ W.prototype.n = function() {
     "freeform-button" == a && (this.c = new N(this.state, "+"));
     "erase-button" == a && (this.c = new Q(this.state));
     "move-button" == a && (this.c = new R(this.state));
-    "text-button" == a && (this.c = new P(this.state));
+    "text-button" == a && (this.c = new O(this.state));
     L(this.state);
     this.view.canvas.focus();
   }.bind(this));
@@ -529,10 +535,10 @@ W.prototype.n = function() {
     39 == a.keyCode && (c = "<right>");
     null != c && this.c.e(c);
   }.bind(this));
-  $("#text-tool-input").keyup(function() {
+  $("#text-tool-input, #freeform-tool-input").keyup(function() {
     this.c.e("");
   }.bind(this));
-  $("#text-tool-input").change(function() {
+  $("#text-tool-input, #freeform-tool-input").change(function() {
     this.c.e("");
   }.bind(this));
   $("#text-tool-close").click(function() {
diff --git a/js-lib/controller.js b/js-lib/controller.js
index f497d85..4c3c67f 100644
--- a/js-lib/controller.js
+++ b/js-lib/controller.js
@@ -140,10 +140,10 @@ ascii.Controller.prototype.installBindings = function() {
   }.bind(this));
 
   // Bit of a hack, just triggers the text tool to get a new value.
-  $('#text-tool-input').keyup(function(){
+  $('#text-tool-input, #freeform-tool-input').keyup(function(){
       this.drawFunction.handleKey('');
   }.bind(this));
-  $('#text-tool-input').change(function(){
+  $('#text-tool-input, #freeform-tool-input').change(function(){
       this.drawFunction.handleKey('');
   }.bind(this));
   $('#text-tool-close').click(function(){
diff --git a/js-lib/draw.js b/js-lib/draw.js
index a62266d..978afa5 100644
--- a/js-lib/draw.js
+++ b/js-lib/draw.js
@@ -150,6 +150,10 @@ ascii.DrawLine.prototype.handleKey = function(value) {};
 ascii.DrawFreeform = function(state, value) {
   this.state = state;
   this.value = value;
+  if (TOUCH_ENABLED) {
+    $('#freeform-tool-input').val('');
+    $('#freeform-tool-input').hide(0, function() {$('#freeform-tool-input').show(0, function() {$('#freeform-tool-input').focus();});});
+  }
 };
 
 /** @inheritDoc */
@@ -174,6 +178,11 @@ ascii.DrawFreeform.prototype.getCursor = function(position) {
 
 /** @inheritDoc */
 ascii.DrawFreeform.prototype.handleKey = function(value) {
+  if (TOUCH_ENABLED) {
+    this.value = $('#freeform-tool-input').val().substr(0, 1);
+    $('#freeform-tool-input').blur();
+    $('#freeform-tool-input').hide(0);
+  }
   if (value.length == 1) {
     // The value is not a special character, so lets use it.
     this.value = value;