diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 4fc11cd1172..a92f80f8f56 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -396,7 +396,7 @@ body.openerp {
 }
 
 /* View Manager */
-.openerp .views_switchers {
+.openerp .views-switchers {
     text-align: right;
 }
 
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 45a823f0181..8fa11b96049 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -55,6 +55,12 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             controller.start();
             this.views[view_type].controller = controller;
         }
+
+        this.$element
+            .find('.views-switchers button').attr('disabled', true)
+            .filter('[data-view-type!="' + view_type + '"]')
+                .removeAttr('disabled');
+
         for (var i in this.views) {
             if (this.views[i].controller) {
                this.views[i].controller.$element.toggle(i === view_type);
@@ -108,7 +114,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
         this.setup_search_view(action);
 
-        this.$element.find('.views_switchers button').click(function() {
+        this.$element.find('.views-switchers button').click(function() {
             self.on_mode_switch($(this).data('view-type'));
         });
         _.each(action.views, function(view) {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 6dac4cb1b94..d610ea001b4 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -126,7 +126,7 @@
 </t>
 <t t-name="ViewManager">
     <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-    <div class="views_switchers">
+    <div class="views-switchers">
         <t t-foreach="views" t-as="view">
             <button type="button" t-att-data-view-type="view[1]">
                 <t t-esc="view[1]"/>