diff --git a/client/src/views/main.js b/client/src/views/main.js
index b62b202bd4..fc24e59f0b 100644
--- a/client/src/views/main.js
+++ b/client/src/views/main.js
@@ -561,15 +561,23 @@ define('views/main', ['view'], function (Dep) {
                 });
             });
 
+            let processUi = () => {
+                this.$headerActionsContainer.find('li > .action[data-name="'+name+'"]').parent().removeClass('hidden');
+                this.$headerActionsContainer.find('a.action[data-name="'+name+'"]').removeClass('hidden');
+
+                this.controlMenuDropdownVisibility();
+                this.adjustButtons();
+            };
+
             if (!this.isRendered()) {
+                if (this.isBeingRendered()) {
+                    this.whenRendered().then(() => processUi());
+                }
+
                 return;
             }
 
-            this.$headerActionsContainer.find('li > .action[data-name="'+name+'"]').parent().removeClass('hidden');
-            this.$headerActionsContainer.find('a.action[data-name="'+name+'"]').removeClass('hidden');
-
-            this.controlMenuDropdownVisibility();
-            this.adjustButtons();
+            processUi();
         },
 
         /**