diff --git a/lib/program.js b/lib/program.js
index 648d868..fec7f4a 100644
--- a/lib/program.js
+++ b/lib/program.js
@@ -255,6 +255,16 @@ Program.prototype.listen = function() {
       return;
     }
 
+    if (key.name === 'enter' && key.sequence === '\n') {
+      key.name = 'linefeed';
+    }
+
+    if (key.name === 'return' && key.sequence === '\r') {
+      key.name = 'enter';
+      self.input.emit('keypress', ch, key);
+      key.name = 'return';
+    }
+
     var name = (key.ctrl ? 'C-' : '')
       + (key.meta ? 'M-' : '')
       + (key.shift && key.name ? 'S-' : '')
diff --git a/test/program-mouse.js b/test/program-mouse.js
index 5d9cdfa..0028d81 100644
--- a/test/program-mouse.js
+++ b/test/program-mouse.js
@@ -28,3 +28,9 @@ program.key(['q', 'escape', 'C-c'], function() {
   program.normalBuffer();
   process.exit(0);
 });
+
+program.on('keypress', function(ch, data) {
+  program.clear();
+  program.cup(0, 0);
+  console.log(data);
+});