diff --git a/core/client/controllers/editor/new.js b/core/client/controllers/editor/new.js
index 841c5ac198..73ba0daf4a 100644
--- a/core/client/controllers/editor/new.js
+++ b/core/client/controllers/editor/new.js
@@ -11,7 +11,6 @@ var EditorNewController = Ember.ObjectController.extend(EditorControllerMixin, {
                 if (model.get('id')) {
                     self.transitionToRoute('editor.edit', model);
                 }
-                return model;
             });
         }
     }
diff --git a/core/client/controllers/posts/post.js b/core/client/controllers/posts/post.js
index 7817da5af6..50a9eb2135 100644
--- a/core/client/controllers/posts/post.js
+++ b/core/client/controllers/posts/post.js
@@ -7,13 +7,12 @@ var PostController = Ember.ObjectController.extend({
             var featured = this.toggleProperty('featured'),
                 self = this;
 
-            self.notifications.closePassive();
-
             this.get('model').save().then(function () {
+                self.notifications.closePassive();
                 self.notifications.showSuccess('Post successfully marked as ' + (featured ? 'featured' : 'not featured') + '.');
             }).catch(function (errors) {
+                self.notifications.closePassive();
                 self.notifications.showErrors(errors);
-                return Ember.RSVP.reject(errors);
             });
         }
     }
diff --git a/core/client/controllers/settings/general.js b/core/client/controllers/settings/general.js
index cdef5188e0..4b1157ac55 100644
--- a/core/client/controllers/settings/general.js
+++ b/core/client/controllers/settings/general.js
@@ -30,16 +30,14 @@ var SettingsGeneralController = Ember.ObjectController.extend({
         save: function () {
             var self = this;
 
-            self.notifications.closePassive();
-
             return this.get('model').save().then(function (model) {
+                self.notifications.closePassive();
                 self.notifications.showSuccess('Settings successfully saved.');
 
                 return model;
             }).catch(function (errors) {
+                self.notifications.closePassive();
                 self.notifications.showErrors(errors);
-
-                return Ember.RSVP.reject(errors);
             });
         },
     }
diff --git a/core/client/controllers/signin.js b/core/client/controllers/signin.js
index de4fe8debf..4f7993303d 100644
--- a/core/client/controllers/signin.js
+++ b/core/client/controllers/signin.js
@@ -12,6 +12,7 @@ var SigninController = Ember.Controller.extend(Ember.SimpleAuth.LoginControllerM
             this.validate({ format: false }).then(function () {
                 self.send('authenticate');
             }).catch(function (errors) {
+                self.notifications.closePassive();
                 self.notifications.showErrors(errors);
             });
         }