diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 976ebe273..97efee5b6 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -38,14 +38,14 @@
           </md-subheader>
           <md-list>
             <md-list-item ng-repeat="folder in app.service.$addressbooks track by folder.id"
-                          ng-click="app.select(folder)"
+                          ng-click="app.select($event, folder)"
                           ng-dblclick="app.edit(folder)"
                           ui-sref="app.addressbook({addressbookId: folder.id})"
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1">
               <md-icon>contacts</md-icon>
               <p class="sg-item-name"
                  ng-show="app.editMode!=folder.id">{{folder.name}}</p>
-              <md-input-container class="md-flex md-tile-content"
+              <md-input-container class="md-flex"
                                   ng-show="app.editMode == folder.id">
                 <input class="sg-item-name" type="text"
                        label:aria-label="Name of the Address Book"
@@ -114,14 +114,14 @@
           </md-subheader>
           <md-list>
             <md-list-item ng-repeat="folder in app.service.$subscriptions track by folder.id"
-                          ng-click="app.select(folder)"
+                          ng-click="app.select($event, folder)"
                           ng-dblclick="app.edit(folder)"
                           ui-sref="app.addressbook({addressbookId: folder.id})"
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1">
               <md-icon>contacts</md-icon>
               <p class="sg-item-name"
                  ng-show="editMode!=folder.id">{{folder.name}}</p>
-              <md-input-container class="md-flex md-tile-content"
+              <md-input-container class="md-flex"
                                   ng-show="app.editMode==folder.id">
                 <input class="sg-item-name" type="text"
                        label:aria-label="Name of the Address Book"
@@ -160,7 +160,7 @@
           </md-subheader>
           <md-list>
             <md-list-item ng-repeat="folder in app.service.$remotes track by folder.id"
-                          ng-click="app.select(folder)"
+                          ng-click="app.select($event, folder)"
                           ui-sref="app.addressbook({addressbookId: folder.id})"
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1">
               <md-icon>public</md-icon>
diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js
index e611cc7a0..373012e83 100644
--- a/UI/WebServerResources/js/Contacts/AddressBooksController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js
@@ -24,10 +24,17 @@
     vm.share = share;
     vm.subscribeToFolder = subscribeToFolder;
 
-    function select(folder) {
-      vm.editMode = false;
-      AddressBook.$query.value = '';
-      $state.go('app.addressbook', {addressbookId: folder.id});
+    function select($event, folder) {
+      if ($state.params.addressbookId != folder.id &&
+          vm.editMode != folder.id) {
+        vm.editMode = false;
+        AddressBook.$query.value = '';
+        $state.go('app.addressbook', {addressbookId: folder.id});
+      }
+      else {
+        $event.preventDefault();
+        $event.stopPropagation();
+      }
     }
 
     function newAddressbook() {