diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index a43d234c0..6bbbe5ef4 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -112,7 +112,7 @@
           actionClass = "UIxMailFolderActions";
           actionName = "createFolder";
         };
-        renameFolder = {
+        save = {
           protectedBy = "View";
           actionClass = "UIxMailFolderActions";
           actionName = "renameFolder";
diff --git a/UI/WebServerResources/js/Mailer/mailbox-model.js b/UI/WebServerResources/js/Mailer/mailbox-model.js
index 358781584..1dca9762e 100644
--- a/UI/WebServerResources/js/Mailer/mailbox-model.js
+++ b/UI/WebServerResources/js/Mailer/mailbox-model.js
@@ -224,6 +224,12 @@
         children,
         i;
 
+    if (this.name == this.$shadowData.name) {
+      // Name hasn't changed
+      deferred.resolve();
+      return deferred.promise;
+    }
+
     // Local recursive function
     findParent = function(parent, children) {
       var parentMailbox = null,