diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 3d6e67747f0..47e0306fd7d 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -33,12 +33,10 @@ export default Ember.Component.extend({
 
     this.appEvents.on('composer:show-preview', () => {
       this.set('showPreview', true);
-      this.keyValueStore.set({ key: 'composer.showPreview', value: true });
     });
 
     this.appEvents.on('composer:hide-preview', () => {
       this.set('showPreview', false);
-      this.keyValueStore.set({ key: 'composer.showPreview', value: false });
     });
   },
 
@@ -52,6 +50,11 @@ export default Ember.Component.extend({
     return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
   },
 
+  @observes('showPreview')
+  showPreviewChanged() {
+      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
+  },
+
   @computed
   markdownOptions() {
     return {
@@ -498,7 +501,6 @@ export default Ember.Component.extend({
 
     togglePreview() {
       this.toggleProperty('showPreview');
-      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
     },
 
     extraButtons(toolbar) {