diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html
index 285f07231..1e52521df 100644
--- a/src/addons/messages/pages/contacts-35/contacts.html
+++ b/src/addons/messages/pages/contacts-35/contacts.html
@@ -7,6 +7,8 @@
{{ 'addon.messages.contacts' | translate }}
+
+
diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html
index 0715dea69..00e28e4d0 100644
--- a/src/addons/messages/pages/contacts/contacts.html
+++ b/src/addons/messages/pages/contacts/contacts.html
@@ -10,6 +10,8 @@
+
+
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index 63fa5426d..67fa310e9 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -7,6 +7,8 @@
{{ 'addon.messages.messages' | translate }}
+
+
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index 71f57c29d..223cc96d7 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -13,6 +13,8 @@
+
+
diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html
index 133b5c5ae..9830db473 100644
--- a/src/addons/messages/pages/search/search.html
+++ b/src/addons/messages/pages/search/search.html
@@ -7,6 +7,8 @@
{{ 'addon.messages.searchcombined' | translate }}
+
+
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index b53392089..90e871645 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -3,6 +3,8 @@
+
+
diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index 3cceba4bb..662ce0cf8 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -164,6 +164,8 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
} else {
// There is a context-menu in these buttons, but there is no main context menu in the header.
// Create one main context menu dynamically.
+ // @todo: Find a better way to handle header buttons. This isn't working as expected in some cases because the menu
+ // is destroyed when the page is destroyed, so click listeners stop working.
mainContextMenuInstance = this.createMainContextMenu();
}
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 350992231..6edf868b4 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -13,6 +13,8 @@
+
+