diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index bd64bf8f7041067f5e959f28befe0ed8d86f3653..fe8c04997aaaeca277d31c86f5eb65aa668969d0 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -28,6 +28,7 @@
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
 
         <div piwik-siteselector
+             class="sites_autocomplete"
              siteid="{{ idSite }}"
              sitename="{{ defaultReportSiteName }}"
              show-all-sites-item="false"
@@ -200,6 +201,7 @@
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
         <div piwik-siteselector
+             class="sites_autocomplete"
              siteid="{{ idSite }}"
              sitename="{{ defaultReportSiteName }}"
              id="image-tracker-website"
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
index cac0a87eac5b4a2973e1419b81e7fa763fa042e0..fb4e73c3b37b8a25355e48f9505a15095ae08561 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
@@ -30,7 +30,6 @@ angular.module('piwikApp').directive('piwikSiteselector', function($document, pi
         templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteselector.html',
         controller: 'SiteSelectorController',
         compile: function (element, attrs) {
-            element.addClass('sites_autocomplete');
 
             for (var index in defaults) {
                if (!attrs[index]) { attrs[index] = defaults[index]; }
diff --git a/plugins/CoreHome/templates/_siteSelectHeader.twig b/plugins/CoreHome/templates/_siteSelectHeader.twig
index d150978d5dee8c67e7b138de7a4ec618461ba360..547f2e41297b5afc74e9e680866e586d6aa16afe 100644
--- a/plugins/CoreHome/templates/_siteSelectHeader.twig
+++ b/plugins/CoreHome/templates/_siteSelectHeader.twig
@@ -1,5 +1,5 @@
 <div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}">
     <label>{{ 'General_Website'|translate }}</label>
-    <div piwik-siteselector></div>
+    <div piwik-siteselector class="sites_autocomplete"></div>
 
 </div>
\ No newline at end of file
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
index 571d6a89838235246b2b6ee429f7f4ac9aa6af1d..2f1ed6337815acc99e59d2003c62dfbf4c58fb52 100644
--- a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
+++ b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
@@ -166,7 +166,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
             if (!lastDate) {
                 return;
             }
-            
+
             model.lastVisitsDate = lastDate;
 
             return piwikApi.fetch({
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 928165ded93d15d12f2873f92e8a31ab1e7f1f18..833245161e446b6021d7e7dd3ab3ea8a0ceb6e83 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -14,6 +14,7 @@
         {% endset %}
 
         <div piwik-siteselector
+             class="sites_autocomplete"
              siteid="{{ idSiteSelected }}"
              sitename="{{ defaultReportSiteName }}"
              all-sites-text="{{ applyAllSitesText|raw }}"
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 6fc0baf03e6db5269a46d96190161978b9309322..d98de49b940ad4d6cb3449b2fc5b2306399ac6a9 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -45,6 +45,7 @@
                 {% endif %}
 
                 <div piwik-siteselector
+                     class="sites_autocomplete"
                      siteid="{{ defaultReportIdSite }}"
                      sitename="{{ defaultReportSiteName }}"
                      switch-site-on-select="false"