diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 55f15e0811..3d93e30c81 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -101,12 +101,12 @@
                 <div id="stream_or_huddle">
                   <ul class="nav nav-pills nav-stacked" id="message-type-tabs">
                     <li class="active" id="stream_toggle">
-                        <a href="#stream-message" data-toggle="pill" title="Send a stream message" tabindex="100" onclick="compose.toggle_mode();">
+                        <a href="#stream-message" data-toggle="pill" title="Send a stream message" tabindex="100" onclick="compose.set_mode('stream');">
                             <i class="icon-bullhorn"></i>
                         </a>
                     </li>
                     <li id="private_message_toggle">
-                        <a href="#private-message" data-toggle="pill" title="Send a private message" tabindex="110" onclick="compose.toggle_mode();">
+                        <a href="#private-message" data-toggle="pill" title="Send a private message" tabindex="110" onclick="compose.set_mode('private');">
                             <i class="icon-user"></i>
                         </a>
                     </li>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 6db8de75fd..4be5be8627 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -150,9 +150,10 @@ exports.clear = function () {
     $("#compose").find('input[type=text], textarea').val('');
 };
 
-exports.toggle_mode = function () {
-    if (compose.composing() === 'stream') {
-        // In stream tab, switch to private
+// Set the mode of a compose already in progress.
+// Does not clear the input fields.
+exports.set_mode = function (mode) {
+    if (mode === 'private') {
         show('private', $("#private_message_recipient"));
         is_composing_message = "private";
     } else {