diff --git a/vanilla_first_setup/gtk/window.ui b/vanilla_first_setup/gtk/window.ui
index 59fc9b7..6e61db1 100644
--- a/vanilla_first_setup/gtk/window.ui
+++ b/vanilla_first_setup/gtk/window.ui
@@ -10,12 +10,12 @@
       <object class="GtkBox">
         <property name="orientation">vertical</property>
         <child>
-          <object class="AdwHeaderBar">
+          <object class="AdwHeaderBar" id="headerbar">
             <style>
               <class name="flat" />
             </style>
             <property name="title_widget">
-              <object class="AdwCarouselIndicatorDots">
+              <object class="AdwCarouselIndicatorDots" id="carousel_indicator_dots">
                 <property name="carousel">carousel</property>
                 <property name="orientation">horizontal</property>
               </object>
diff --git a/vanilla_first_setup/window.py b/vanilla_first_setup/window.py
index fa0bf6b..8ef90ed 100644
--- a/vanilla_first_setup/window.py
+++ b/vanilla_first_setup/window.py
@@ -31,6 +31,8 @@ class VanillaWindow(Adw.ApplicationWindow):
     __gtype_name__ = 'VanillaWindow'
 
     carousel = Gtk.Template.Child()
+    carousel_indicator_dots = Gtk.Template.Child()
+    headerbar = Gtk.Template.Child()
     btn_back = Gtk.Template.Child()
     toasts = Gtk.Template.Child()
 
@@ -85,9 +87,13 @@ class VanillaWindow(Adw.ApplicationWindow):
 
         if page not in [self.__view_progress, self.__view_done]:
             self.btn_back.set_visible(cur_index != 0.0)
+            self.carousel_indicator_dots.set_visible(cur_index != 0.0)
+            self.headerbar.set_show_end_title_buttons(cur_index != 0.0)
             return
 
         self.btn_back.set_visible(False)
+        self.carousel_indicator_dots.set_visible(False)
+        self.headerbar.set_show_end_title_buttons(False)
 
         # keep the btn_back button locked if this is the last page
         if page == self.__view_done: