diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
index cd5369638c7..205044922e4 100644
--- a/app/assets/javascripts/discourse/components/composer-toggles.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
@@ -3,6 +3,14 @@ import computed from 'ember-addons/ember-computed-decorators';
 export default Ember.Component.extend({
   tagName: '',
 
+  @computed('composeState')
+  title(composeState) {
+    if (composeState === "draft" || composeState === "saving") {
+      return "composer.abandon";
+    }
+    return "composer.collapse";
+  },
+
   @computed('composeState')
   toggleIcon(composeState) {
     if (composeState === "draft" || composeState === "saving") {
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 40a7efe60a1..c2622478c30 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -303,15 +303,18 @@ export default Ember.Controller.extend({
     // Toggle the reply view
     toggle() {
       this.closeAutocomplete();
-      if (this.get('model.composeState') === Composer.OPEN) {
-        if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
-          this.close();
-        } else {
-          this.shrink();
-        }
-      } else {
+
+      if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
         this.close();
+      } else {
+        if (this.get('model.composeState') === Composer.OPEN) {
+          this.shrink();
+        } else {
+          debugger;
+          this.cancelComposer();
+        }
       }
+
       return false;
     },
 
diff --git a/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
index 41646e2108a..93263ae3cbe 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
@@ -10,5 +10,5 @@
     class="toggler"
     icon=toggleIcon
     action=toggleComposer
-    title='composer.toggler'}}
-</div>
\ No newline at end of file
+    title=title}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 11400521bb3..736d7237c50 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -24,13 +24,9 @@
                           addLinkLookup="addLinkLookup"}}
 
       {{#if model.viewOpen}}
- 
         <div class="reply-area {{if canEditTags 'with-tags'}}">
-
           <div class='composer-fields'>
-
             {{plugin-outlet name="composer-open" args=(hash model=model)}}
-
             <div class='reply-to'>
               <div class="reply-details">
                 {{{model.actionTitle}}}
@@ -119,7 +115,6 @@
           <div class='submit-panel'>
             {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
 
-     
             <div class='save-or-cancel'>
               {{composer-save-button action=(action "save")
                                      icon=model.saveIcon
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 48cca6e3c5c..4979bfb1407 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1275,7 +1275,8 @@ en:
       ulist_title: "Bulleted List"
       list_item: "List item"
       help: "Markdown Editing Help"
-      toggler: "hide or show the composer panel"
+      collapse: "minimize the composer panel"
+      abandon: "close composer and discard draft"
       modal_ok: "OK"
       modal_cancel: "Cancel"
       cant_send_pm: "Sorry, you can't send a message to %{username}."