diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index dc61a659b..8b6d88e9c 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -20,26 +20,29 @@
   </script>
 
   <script type="text/ng-template" id="preferences.html">
-
     <md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
       <var:component className="UIxSidenavToolbarTemplate" />
       <md-content md-scroll-y="md-scroll-y" class="md-flex">
         <md-list>
-          <md-list-item ui-sref-active="sg-active">
-            <button class="md-button md-flex sg-item-name"
-                    ui-sref="preferences.general"><var:string label:value="General"/></button>
+          <md-list-item ng-click="app.go('general')"
+                        ui-sref="preferences.general"
+                        ui-sref-active="sg-active">
+            <p class="sg-item-name"><var:string label:value="General"/></p>
           </md-list-item>
-          <md-list-item ui-sref-active="sg-active">
-            <button class="md-button md-flex sg-item-name"
-                    ui-sref="preferences.calendars"><var:string label:value="Calendar"/></button>
+          <md-list-item ng-click="app.go('calendars')"
+                        ui-sref="preferences.calendars"
+                        ui-sref-active="sg-active">
+            <p class="sg-item-name"><var:string label:value="Calendar"/></p>
           </md-list-item>
-          <md-list-item ui-sref-active="sg-active">
-            <button class="md-button md-flex sg-item-name"
-                    ui-sref="preferences.addressbooks"><var:string label:value="Contacts"/></button>
+          <md-list-item ng-click="app.go('addressbooks')"
+                        ui-sref="preferences.addressbooks"
+                        ui-sref-active="sg-active">
+            <p class="sg-item-name"><var:string label:value="Contacts"/></p>
           </md-list-item>
-          <md-list-item ui-sref-active="sg-active">
-            <button class="md-button md-flex sg-item-name"
-                    ui-sref="preferences.mailer"><var:string label:value="Mail"/></button>
+          <md-list-item ng-click="app.go('mailer')"
+                        ui-sref="preferences.mailer"
+                        ui-sref-active="sg-active">
+            <p class="sg-item-name"><var:string label:value="Mail"/></p>
           </md-list-item>
         </md-list>
       </md-content>
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 8f308b03c..3a5f54592 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -7,13 +7,14 @@
   /**
    * @ngInject
    */
-  PreferencesController.$inject = ['$scope', '$timeout', '$q', '$mdDialog', 'User', 'Mailbox', 'statePreferences', 'Authentication'];
-  function PreferencesController($scope, $timeout, $q, $mdDialog, User, Mailbox, statePreferences, Authentication) {
+  PreferencesController.$inject = ['$state', '$mdDialog', 'User', 'Mailbox', 'statePreferences', 'Authentication'];
+  function PreferencesController($state, $mdDialog, User, Mailbox, statePreferences, Authentication) {
     var vm = this;
 
     vm.preferences = statePreferences;
     vm.passwords = { newPassword: null, newPasswordConfirmation: null };
 
+    vm.go = go;
     vm.addCalendarCategory = addCalendarCategory;
     vm.removeCalendarCategory = removeCalendarCategory;
     vm.addContactCategory = addContactCategory;
@@ -34,7 +35,11 @@
     vm.timeZonesListFilter = timeZonesListFilter;
     vm.timeZonesSearchText = '';
     vm.mailboxes = Mailbox.$find({ id: 0 });
-    
+
+    function go(module) {
+      $state.go('preferences.' + module);
+    }
+
     function addCalendarCategory() {
       vm.preferences.defaults.SOGoCalendarCategoriesColors["New category"] = "#aaa";
       vm.preferences.defaults.SOGoCalendarCategories.push("New category");