diff --git a/index.html b/index.html
index 3a297fa..5f6ad11 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,7 @@
     <script type="text/template" id="taskTemplate">
       <div class="task">
         <div class="link">•</div>
-        <textarea class="edit"><%= content %></textarea>
+        <textarea rows="1" cols="1" class="edit"><%= content %></textarea>
       </div>
     </script>
     <script src="javascripts/vendor/jquery.min.js"></script>
diff --git a/javascripts/app.js b/javascripts/app.js
index 5e89968..860b05d 100644
--- a/javascripts/app.js
+++ b/javascripts/app.js
@@ -1,4 +1,5 @@
 var app = app || {};
+var ENTER_KEY = 13;
 
 $(function(){
 
diff --git a/javascripts/views/task.js b/javascripts/views/task.js
index 959ff5d..4d2a34e 100644
--- a/javascripts/views/task.js
+++ b/javascripts/views/task.js
@@ -31,8 +31,13 @@ var app = app || {};
       this.$el.removeClass('editing');
     },
 
-    add: function() {
-      this.$input.blur();
+    add: function(e) {
+      if (e.which === ENTER_KEY) {
+        this.$input.blur();
+        var render = new app.TaskView({model: new app.Task()}).render();
+        render.$el.insertAfter(this.$el);
+        render.$input.focus();
+      }
     }
 
   });