diff --git a/plinth/modules/first_boot/templates/base_firstboot.html b/plinth/modules/first_boot/templates/base_firstboot.html
index ed22363e0..7efe77fd6 100644
--- a/plinth/modules/first_boot/templates/base_firstboot.html
+++ b/plinth/modules/first_boot/templates/base_firstboot.html
@@ -12,6 +12,15 @@ no-brand
 {% block mainmenu_left_collapse %}
 {% endblock %}
 
+{% block notifications_dropdown %}
+{% endblock %}
+
+{% block mainmenu_toggler %}
+  {% if user.is_authenticated %}
+    {{ block.super }}
+  {% endif %}
+{% endblock %}
+
 {% block mainmenu_right %}
   {% if user.is_authenticated %}
     {% include "firstboot_navbar.html" %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 3bc8e83a5..eb91fc4b6 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -89,15 +89,19 @@
           </a>
         {% endblock %}
 
-        <ul class="navbar-nav">
-          {% include "notifications-dropdown.html" %}
-        </ul>
+        {% block notifications_dropdown %}
+          <ul class="navbar-nav">
+            {% include "notifications-dropdown.html" %}
+          </ul>
+        {% endblock %}
 
-        <button class="navbar-toggler" type="button" data-toggle="collapse"
-                data-target="#navbar-collapse" aria-controls="navbar-collapse"
-                aria-expanded="false" aria-label="Toggle navigation">
-          <span class="fa fa-bars"></span>
-        </button>
+        {% block mainmenu_toggler %}
+          <button class="navbar-toggler" type="button" data-toggle="collapse"
+                  data-target="#navbar-collapse" aria-controls="navbar-collapse"
+                  aria-expanded="false" aria-label="Toggle navigation">
+            <span class="fa fa-bars"></span>
+          </button>
+        {% endblock %}
 
         <div class="collapse navbar-collapse" id="navbar-collapse">
           <ul class="navbar-nav flex-grow-1">