diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index c9acc89eb1..d053c96e37 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -77,13 +77,28 @@ exports.clear = function () {
     $("#compose").find('input[type=text], textarea').val('');
 };
 
+exports.set_message_type = function (tabname) {
+    is_composing_message = tabname;
+    $("#send-status").removeClass(status_classes).hide();
+    if (tabname === "stream") {
+        $('#personal-message').hide();
+        $('#stream-message').show();
+        $('#new_message_type').val('stream');
+        $("#stream").focus();
+    } else {
+        $('#personal-message').show();
+        $('#stream-message').hide();
+        $('#new_message_type').val('personal');
+        $("#huddle_recipient").focus();
+    }
+};
+
+
 exports.toggle_mode = function () {
     if ($("#message-type-tabs li.active").find("a[href=#stream-message]").length !== 0) {
         // In stream tab, switch to personals.
-        is_composing_message = "huddle";
         exports.show('personal', $("#huddle_recipient"));
     } else {
-        is_composing_message = "stream";
         exports.show('stream', $("#stream"));
     }
 };
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 58ce12b722..21aecd2004 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -262,18 +262,10 @@ $(function () {
     // created after ready() is called.
 
     $('#message-type-tabs a[href="#stream-message"]').on('shown', function (e) {
-        $('#personal-message').hide();
-        $('#stream-message').show();
-        $('#new_message_type').val('stream');
-        $("#send-status").removeClass(status_classes).hide();
-        focus_on("stream");
+        compose.set_message_type('stream');
     });
     $('#message-type-tabs a[href="#personal-message"]').on('shown', function (e) {
-        $('#personal-message').show();
-        $('#stream-message').hide();
-        $('#new_message_type').val('personal');
-        $("#send-status").removeClass(status_classes).hide();
-        focus_on("huddle_recipient");
+        compose.set_message_type('huddle');
     });
 
     // Prepare the click handler for subbing to a new stream to which