diff --git a/core/client/controllers/post-settings-menu.js b/core/client/controllers/post-settings-menu.js
index b20c5442af..de8e094c02 100644
--- a/core/client/controllers/post-settings-menu.js
+++ b/core/client/controllers/post-settings-menu.js
@@ -152,6 +152,9 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
 
             // Ignore unchanged slugs or candidate slugs that are empty
             if (!newSlug || slug === newSlug) {
+                // reset the input to its previous state
+                this.set('slugValue', slug);
+
                 return;
             }
 
@@ -176,6 +179,8 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
                 // for the incrementor then the existing slug should be used
                 if (_.isNumber(check) && check > 0) {
                     if (slug === slugTokens.join('-') && serverSlug !== newSlug) {
+                        self.set('slugValue', slug);
+
                         return;
                     }
                 }
@@ -193,9 +198,11 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
                 }
 
                 return self.get('model').save(self.get('saveOptions'));
-            }).then(function () {
-                self.showSuccess('Permalink successfully changed to <strong>' +
+            }).then(function (changed) {
+                if (changed) {
+                    self.showSuccess('Permalink successfully changed to <strong>' +
                     self.get('slug') + '</strong>.');
+                }
             }).catch(function (errors) {
                 self.showErrors(errors);
                 self.get('model').rollback();
diff --git a/core/test/functional/client/psm_test.js b/core/test/functional/client/psm_test.js
index 8b70c7e361..ec23ca4bcb 100644
--- a/core/test/functional/client/psm_test.js
+++ b/core/test/functional/client/psm_test.js
@@ -225,4 +225,46 @@ CasperTest.begin('Post can be changed to static page', 6, function suite(test) {
 
         test.assertDoesntExist('.post-setting-static-page:checked', 'can turn off static page');
     });
+});
+
+CasperTest.begin('Post url input is reset from all whitespace back to original value', 3, function suite(test) {
+    // Create a sample post
+    CasperTest.Routines.createTestPost.run(false);
+
+    // Begin test
+    casper.thenOpenAndWaitForPageLoad('content', function testTitleAndUrl() {
+        test.assertTitle('Ghost Admin', 'Title is "Ghost Admin"');
+        test.assertUrlMatch(/ghost\/\d+\/$/, 'Landed on the correct URL');
+    });
+
+    // Transition to the editor
+    casper.thenClick('.post-edit');
+    casper.waitForSelector('#entry-title');
+
+    casper.thenClick('.post-settings');
+    casper.waitForOpaque('.post-settings-menu.open');
+
+    var originalSlug;
+    casper.then(function () {
+        originalSlug = casper.evaluate(function () {
+            return __utils__.getFieldValue('post-setting-slug');
+        });
+    });
+
+    // Test change permalink
+    casper.then(function () {
+        this.fillSelectors('.post-settings-menu form', {
+            '#url': '    '
+        }, false);
+
+        this.click('button.post-settings');
+    });
+
+    casper.then(function checkValueMatches() {
+        //using assertField(name) checks the htmls initial "value" attribute, so have to hack around it.
+        var slugVal = this.evaluate(function () {
+            return __utils__.getFieldValue('post-setting-slug');
+        });
+        test.assertEqual(slugVal, originalSlug);
+    });
 });
\ No newline at end of file