diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index eae175a04e31ba078ac73f7c7c5f285e988d5b37..a56ec49b9b2483f1df73d9ecc24da56d1f6d4366 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -16,7 +16,7 @@ var Stream = {
     });
 
     $stream.delegate("textarea.comment_box", "keydown", function(e){
-      if (e.keyCode === 13) {
+      if (e.shiftKey && e.keyCode === 13) {
         $(this).closest("form").submit();
       }
     });
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 870d1f07adaaab143858d6f15a5f6de1a9c9f1bb..c34643613b1621ab2b67e921a927524227d86b96 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -35,7 +35,7 @@ var View = {
 
     /* Submitting the status message form when the user hits enter */
     $(this.publisher.selector)
-      .keyup(this.publisher.keyup);
+      .keydown(this.publisher.keydown);
 
     /* User menu */
     $(this.userMenu.selector)
@@ -118,8 +118,8 @@ var View = {
   },
 
   publisher: {
-    keyup: function(e) {
-      if(e.keyCode === 13) {
+    keydown: function(e) {
+      if(e.shiftKey && e.keyCode === 13) {
         $(this).closest("form").submit();
       }
     },
diff --git a/spec/javascripts/view-spec.js b/spec/javascripts/view-spec.js
index 5c079487cb24f107b1678e2828796ff81ee0150f..6a8dc239b355e5da54d0010af81094c8b7ceb809 100644
--- a/spec/javascripts/view-spec.js
+++ b/spec/javascripts/view-spec.js
@@ -102,19 +102,20 @@ describe("View", function() {
       );
     });
 
-    describe("keyup", function() { 
+    describe("keydown", function() { 
       it("is called when the user types", function() {
-        spyOn(View.publisher, "keyup");
+        spyOn(View.publisher, "keydown");
         View.initialize();
-        $(View.publisher.selector).trigger("keyup");
-        expect(View.publisher.keyup).toHaveBeenCalled();
+        $(View.publisher.selector).trigger("keydown");
+        expect(View.publisher.keydown).toHaveBeenCalled();
       });
 
       it("submits the form if the user hits enter while the textarea is focused", function() {
         spyOn($.fn, "submit");
         View.initialize();
         $(View.publisher.selector).focus();
-        var event = $.Event("keyup");
+        var event = $.Event("keydown");
+        var event.ShiftKey = true;
         event.keyCode = 13;
         $(View.publisher.selector).trigger(event);
         expect($.fn.submit).toHaveBeenCalled();