diff --git a/zephyr/static/js/composebox_typeahead.js b/zephyr/static/js/composebox_typeahead.js
index a8e52197ec..408f3ce3dd 100644
--- a/zephyr/static/js/composebox_typeahead.js
+++ b/zephyr/static/js/composebox_typeahead.js
@@ -169,6 +169,11 @@ exports.initialize = function () {
         } else {
             send_button.fadeIn();
         }
+
+        // Refocus in the content box so you can continue typing or
+        // press Enter to send.
+        $("#new_message_content").focus();
+
         return $.ajax({
             dataType: 'json',
             url: '/json/change_enter_sends',