diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index b145f7573..a604f40fc 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -59,11 +59,9 @@ Discourse.ComposerController = Discourse.Controller.extend({
         message = Em.String.i18n("composer.posting_not_on_topic", {title: this.get('content.topic.title')});
 
         buttons = [{
-          "label": Em.String.i18n("composer.reply_original") + "<br/><div class='topic-title'>" + this.get('content.topic.title') + "</div>",
-          "class": "btn-primary btn-reply-on-original",
-          "callback": function(){
-            _this.save(true);
-          }
+          "label": Em.String.i18n("composer.cancel"),
+          "class": "cancel",
+          "link": true
         }];
 
         if(topic) {
@@ -79,9 +77,11 @@ Discourse.ComposerController = Discourse.Controller.extend({
         }
 
         buttons.push({
-          "label": Em.String.i18n("composer.cancel"),
-          "class": "cancel",
-          "link": true
+          "label": Em.String.i18n("composer.reply_original") + "<br/><div class='topic-title'>" + this.get('content.topic.title') + "</div>",
+          "class": "btn-primary btn-reply-on-original",
+          "callback": function(){
+            _this.save(true);
+          }
         });
 
         bootbox.dialog(message, buttons, {"classes": "reply-where-modal"});
diff --git a/app/assets/javascripts/external/bootbox.js b/app/assets/javascripts/external/bootbox.js
index 256e538d9..dfdb16948 100644
--- a/app/assets/javascripts/external/bootbox.js
+++ b/app/assets/javascripts/external/bootbox.js
@@ -350,7 +350,7 @@ var bootbox = window.bootbox || (function(document, $) {
                 href = _defaultHref;
             }
 
-            buttons = "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+""+label+"</a>" + buttons;
+            buttons = buttons + "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+""+label+"</a>";
 
             callbacks[i] = callback;
         }