diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js
index 6a8a162e144..ec7ce95313a 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/addons/web/static/src/js/view_manager.js
@@ -458,6 +458,9 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
         }
     },
     do_load_state: function(state, warm) {
+        if (state.view_type && state.view_type !== this.active_view.type) {
+            this.switch_mode(state.view_type, true);
+        }
         this.active_view.controller.do_load_state(state, warm);
     },
 });