diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
index b217677d10768213e53164c84b1f40f9b2878a3a..3fbd008740f834c437070d81cb34046a3d468c54 100644
--- a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
+++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
@@ -135,19 +135,22 @@
 
                 function (timezones) {
 
+                    var scopeTimezones = [];
                     $scope.timezones = [];
 
                     angular.forEach(timezones, function(groupTimezones, timezoneGroup) {
 
                         angular.forEach(groupTimezones, function(label, code) {
 
-                            $scope.timezones.push({
+                            scopeTimezones.push({
                                 group: timezoneGroup,
                                 key: code,
                                 value: label
                             });
                         });
                     });
+
+                    $scope.timezones = scopeTimezones;
                 }
             );
         };
diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html
index 4e3cfd5f5bd0210f5d050f36095e12a7d6ad2416..89f4befd81d1166d4c3deb425dc5ed695af0a2c7 100644
--- a/plugins/SitesManager/templates/sites-list/site-fields.html
+++ b/plugins/SitesManager/templates/sites-list/site-fields.html
@@ -84,25 +84,23 @@
                 <div piwik-form-field="setting" all-settings="settingsPerPlugin.settings"></div>
             </div>
         </div>
+        
+        <div piwik-field uicontrol="select" name="currency"
+             ng-model="site.currency"
+             title="{{ 'SitesManager_Currency'|translate }}"
+             inline-help="{{ 'SitesManager_CurrencySymbolWillBeUsedForGoals' | translate }}"
+             options='currencies'>
+        </div>
 
-        <div class="form-group row">
-            <div class="col s12 m6 input-field">
-                <select ng-model="site.currency" ng-options="k as v for (k, v) in currencies"></select>
-                <label>{{ 'SitesManager_Currency'|translate }}</label>
-            </div>
-            <div class="col s12 m6 form-help">
-                {{ 'SitesManager_CurrencySymbolWillBeUsedForGoals' | translate }}
-            </div>
+        <div piwik-field uicontrol="select" name="timezone"
+             ng-model="site.timezone"
+             title="{{ 'SitesManager_Timezone'|translate }}"
+             inline-help="#timezoneHelpText"
+             options='timezones'>
         </div>
 
-        <div class="form-group row">
-            <div class="col s12 m6 input-field">
-                <select ng-model="site.timezone" ng-options="t.key as t.value group by t.group for t in timezones"></select>
-                <label>{{ 'SitesManager_Timezone'|translate }}</label>
-            </div>
-            <div class="col s12 m6 form-help">
-                <div ng-include="'plugins/SitesManager/templates/help/timezone-help.html'"></div>
-            </div>
+        <div id="timezoneHelpText" class="inline-help-node">
+            <div ng-include="'plugins/SitesManager/templates/help/timezone-help.html'"></div>
         </div>
 
         <div class="editingSiteFooter">