diff --git a/www/todo/inner.js b/www/todo/inner.js
index e02fa9440..69ef53f73 100644
--- a/www/todo/inner.js
+++ b/www/todo/inner.js
@@ -1,7 +1,7 @@
 define([
     'jquery',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
-    //'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'less!/todo/todo.less',
     //'less!/customize/src/less/cryptpad.less',
     'less!/customize/src/less/toolbar.less',
diff --git a/www/todo/main.js b/www/todo/main.js
index a46c0f2f7..059e9d9a3 100644
--- a/www/todo/main.js
+++ b/www/todo/main.js
@@ -48,7 +48,7 @@ define([
                     .text(new Date(APP.lm.proxy.data[el].ctime).toLocaleString())
                     .appendTo($taskDiv);
                 $('<button>', {
-                    'class': 'fa fa-times cp-task-remove'
+                    'class': 'fa fa-times cp-task-remove btn btn-danger'
                 }).appendTo($taskDiv).on('click', function() {
                     deleteTask(el);
                 });
@@ -71,7 +71,16 @@ define([
             display();
         };
 
-        $iframe.find('.cp-create-form button').on('click', addTask);
+        var $formSubmit = $iframe.find('.cp-create-form button').on('click', addTask);
+        var $input = $iframe.find('#newTodoName').on('keypress', function (e) {
+            switch (e.which) {
+                case 13:
+                    $formSubmit.click();
+                    break;
+                default:
+                    console.log(e.which);
+            }
+        });
 
         var editTask = function () {