diff --git a/static/js/compose_actions.js b/static/js/compose_actions.js
index e0fd335e18..52ac21aab0 100644
--- a/static/js/compose_actions.js
+++ b/static/js/compose_actions.js
@@ -193,7 +193,7 @@ exports.start = function (msg_type, opts) {
     opts = fill_in_opts_from_current_narrowed_view(msg_type, opts);
     // If we are invoked by a compose hotkey (c or C), do not assume that we know
     // what the message's topic or PM recipient should be.
-    if (opts.trigger === "compose_hotkey") {
+    if ((opts.trigger === "compose_hotkey") || (opts.trigger === "new topic button")) {
         opts.subject = '';
         opts.private_message_recipient = '';
     }