diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index dd8213a4a..7f1f56b2d 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -47,7 +47,7 @@
                  ng-show="app.editMode!=folder.id">{{folder.name}}</p>
               <md-input-container class="md-flex md-tile-content"
                                   ng-show="app.editMode == folder.id">
-                <input class="folder-name" type="text"
+                <input class="sg-item-name" type="text"
                        label:aria-label="Name of the Address Book"
                        ng-model="folder.name"
                        ng-cloak="ng-cloak"
@@ -123,7 +123,7 @@
                  ng-show="editMode!=folder.id">{{folder.name}}</p>
               <md-input-container class="md-flex md-tile-content"
                                   ng-show="app.editMode==folder.id">
-                <input class="folder-name" type="text"
+                <input class="sg-item-name" type="text"
                        label:aria-label="Name of the Address Book"
                        ng-model="folder.name"
                        ng-cloak="ng-cloak"
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index d5711630f..ec51be5ec 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -260,9 +260,9 @@
                 {{app.metadataForFolder(folder).name}}
                 <span ng-show="folder.unseenCount"> ({{folder.unseenCount}})</span>
               </p>
-              <md-input-container class="md-flex md-tile-content"
+              <md-input-container class="md-flex"
                                   ng-show="app.editMode == folder.path">
-                <input class="folder-name" type="text"
+                <input class="sg-item-name" type="text"
                        label:aria-label="Enter the new name of your folder"
                        ng-model="folder.name"
                        ng-blur="app.saveFolder(folder)"
diff --git a/UI/WebServerResources/js/Common/sgEnter.directive.js b/UI/WebServerResources/js/Common/sgEnter.directive.js
index a4d66c4ca..306a8a043 100644
--- a/UI/WebServerResources/js/Common/sgEnter.directive.js
+++ b/UI/WebServerResources/js/Common/sgEnter.directive.js
@@ -17,9 +17,7 @@
     return function(scope, element, attrs) {
       element.bind("keydown keypress", function(event) {
         if (event.which === ENTER_KEY) {
-          scope.$apply(function() {
-            scope.$eval(attrs.sgEnter);
-          });
+          scope.$apply(attrs.sgEnter);
           event.preventDefault();
         }
       });
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index 1a6d09d4b..07af203f1 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -351,15 +351,13 @@
   Mailbox.prototype.$rename = function() {
     var _this = this,
         findParent,
-        deferred = Mailbox.$q.defer(),
         parent,
         children,
         i;
 
     if (this.name == this.$shadowData.name) {
       // Name hasn't changed
-      deferred.resolve();
-      return deferred.promise;
+      return Mailbox.$q.when();
     }
 
     // Local recursive function
@@ -391,7 +389,7 @@
     // Find index of mailbox among siblings
     i = _.indexOf(_.pluck(children, 'id'), this.id);
 
-    this.$save().then(function(data) {
+    return this.$save().then(function(data) {
       var sibling;
       angular.extend(_this, data); // update the path attribute
       _this.id = _this.$id();
@@ -409,13 +407,7 @@
         i = children.length;
       }
       children.splice(i, 0, _this);
-
-      deferred.resolve();
-    }, function(data) {
-      deferred.reject(data);
     });
-
-    return deferred.promise;
   };
 
   /**
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index 792bb40cb..8b78f247e 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -222,7 +222,12 @@
     }
 
     function saveFolder(folder) {
-      folder.$rename();
+      folder.$rename()
+        .then(function(data) {
+          vm.editMode = false;
+        }, function(data, status) {
+          Dialog.alert(l('Warning'), data);
+        });
     }
 
     function compactFolder(folder) {
diff --git a/UI/WebServerResources/scss/components/list/list.scss b/UI/WebServerResources/scss/components/list/list.scss
index c1630f61a..200845c6b 100644
--- a/UI/WebServerResources/scss/components/list/list.scss
+++ b/UI/WebServerResources/scss/components/list/list.scss
@@ -25,6 +25,16 @@ md-list-item {
   }
 }
 
+// Remove padding of input fields in the sidenav for better transitions between read and edit mode of a folder
+md-sidenav {
+  md-input-container {
+    padding: 0;
+    .md-input {
+      padding-left: 0;
+    }
+  }
+}
+
 // Add some padding to the first icon in a list item
 //.md-list-item-inner {
 //  > i:first-child {