diff --git a/client/src/views/header.js b/client/src/views/header.js
index 14b3ebb8b8..d6aba853e1 100644
--- a/client/src/views/header.js
+++ b/client/src/views/header.js
@@ -76,12 +76,20 @@ define('views/header', ['view'], function (Dep) {
                     }
                 });
             }
+
+            this.wasRendered = false;
         },
 
         afterRender: function () {
             if (this.options.fontSizeFlexible) {
                 this.adjustFontSize();
             }
+
+            if (this.wasRendered) {
+                this.getParentView().trigger('header-rendered');
+            }
+
+            this.wasRendered = true;
         },
 
         adjustFontSize: function (step) {
diff --git a/client/src/views/main.js b/client/src/views/main.js
index 5c2bbd5e3b..54bd6c1e1c 100644
--- a/client/src/views/main.js
+++ b/client/src/views/main.js
@@ -170,6 +170,10 @@ define('views/main', ['view'], function (Dep) {
                 this.$headerActionsContainer = this.$el.find('.page-header .header-buttons');
             });
 
+            this.on('header-rendered', () => {
+                this.$headerActionsContainer = this.$el.find('.page-header .header-buttons');
+            });
+
             this.on('after:render', () => this.adjustButtons());
 
             if (this.shortcutKeys) {
@@ -399,14 +403,14 @@ define('views/main', ['view'], function (Dep) {
             this.menu[type][method](item);
 
             if (!doNotReRender && this.isRendered()) {
-                this.getView('header').reRender();
+                this.getHeaderView().reRender();
 
                 return;
             }
 
             if (!doNotReRender && this.isBeingRendered()) {
                 this.once('after:render', () => {
-                    this.getView('header').reRender();
+                    this.getHeaderView().reRender();
                 });
             }
         },
@@ -437,14 +441,14 @@ define('views/main', ['view'], function (Dep) {
             }
 
             if (!doNotReRender && this.isRendered()) {
-                this.getView('header').reRender();
+                this.getHeaderView().reRender();
 
                 return;
             }
 
             if (!doNotReRender && this.isBeingRendered()) {
                 this.once('after:render', () => {
-                    this.getView('header').reRender();
+                    this.getHeaderView().reRender();
                 });
 
                 return;