diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b5c69f5c82f..7d012b8764f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1057,6 +1057,7 @@ instance.web.WebClient = instance.web.Client.extend({
     },
     do_push_state: function(state) {
         this.set_title(state.title);
+        delete state.title;
         var url = '#' + $.param(state);
         this._current_state = _.clone(state);
         $.bbq.pushState(url);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index ddf4050fa38..d1040937a41 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -120,7 +120,9 @@ instance.web.ActionManager = instance.web.Widget.extend({
         if (this.getParent() && this.getParent().do_push_state) {
             if (this.inner_action) {
                 state['title'] = this.inner_action.name;
-                state['model'] = this.inner_action.res_model;
+                if(this.inner_action.type == 'ir.actions.act_window') {
+                    state['model'] = this.inner_action.res_model;
+                }
                 if (this.inner_action.id) {
                     state['action_id'] = this.inner_action.id;
                 }
@@ -223,7 +225,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 // These buttons will be overwrited by <footer> if any
                 this.dialog = new instance.web.Dialog(this, {
                     buttons: { "Close": function() { $(this).dialog("close"); }},
-		    dialogClass: 'oe_act_window'
+                    dialogClass: 'oe_act_window'
                 });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
@@ -270,6 +272,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
             widget: this.inner_widget,
             title: action.name
         });
+        this.inner_action = action;
+        this.do_push_state({});
         this.inner_widget.appendTo(this.$element);
     },
     ir_actions_report_xml: function(action, on_closed) {