diff --git a/static/debug.js b/static/debug.js
index c752d7c..79a1144 100644
--- a/static/debug.js
+++ b/static/debug.js
@@ -34,6 +34,8 @@ var onReady = function() {
   }
   cosmo = new Cosmopolite(callbacks);
 
+  elements['messageText'].addEventListener('keypress', messageKeyPress);
+  elements['pinText'].addEventListener('keypress', pinKeyPress);
   document.getElementById('pin').addEventListener('click', pin);
   document.getElementById('sendMessage').addEventListener('click', sendMessage);
   document.getElementById('subscribe').addEventListener('click', subscribe);
@@ -240,6 +242,12 @@ var sendMessage = function() {
   elements['messageText'].value = '';
 };
 
+var messageKeyPress = function(e) {
+  if (e.keyCode == 13) {
+    sendMessage();
+  }
+};
+
 var pin = function() {
   if (!selectedSubject) {
     alert('Please select a subject.');
@@ -249,6 +257,12 @@ var pin = function() {
   elements['pinText'].value = '';
 };
 
+var pinKeyPress = function(e) {
+  if (e.keyCode == 13) {
+    pin();
+  }
+};
+
 var senderID = function(msg) {
   var id = Math.abs(msg['sender'].hashCode() % 1000000);
   if (msg['sender'] == cosmo.currentProfile()) {