diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 44e72c46a0..f5a5d7e768 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -175,13 +175,13 @@ var people_list = [
                 <div>
                   <button type="button" class="visible-phone btn btn-small phone_new_message_button"
                           id="left_bar_compose_stream_button_little"
-                          onclick="compose.start('stream');"
+                          onclick="compose.set_mode('stream');"
                           title="New stream message">
                     <i class="icon-bullhorn"></i>
                   </button>
                   <button type="button" class="visible-phone btn btn-small phone_new_message_button"
                           id="left_bar_compose_private_button_little"
-                          onclick="compose.start('private');"
+                          onclick="compose.set_mode('private');"
                           title="New private message">
                     <i class="icon-user"></i>
                   </button>
@@ -190,14 +190,14 @@ var people_list = [
               <div class="hidden-phone new_message_button">
                 <button type="button" class="btn btn-large btn-block"
                         id="left_bar_compose_stream_button_big"
-                        onclick="compose.start('stream');">
+                        onclick="compose.set_mode('stream');">
                   <i class="icon-bullhorn"></i> New stream message
                 </button>
               </div>
               <div class="hidden-phone new_message_button">
                 <button type="button" class="btn btn-large btn-block"
                         id="left_bar_compose_private_button_big"
-                        onclick="compose.start('private');">
+                        onclick="compose.set_mode('private');">
                   <i class="icon-user"></i> New private message
                 </button>
               </div>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 2277ec57c2..ae0592ea82 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -187,9 +187,9 @@ exports.clear = function () {
 // Set the mode of a compose already in progress.
 // Does not clear the input fields.
 exports.set_mode = function (mode) {
-    if (!is_composing_message)
-        return;
-
+    if (!is_composing_message) {
+        exports.start(mode);
+    }
     if (mode === 'private') {
         show('private', $("#private_message_recipient"));
         is_composing_message = "private";