diff --git a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
index 9bebbf0..4a1d8d4 100644
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -86,8 +86,6 @@ class MainActivity : AppCompatActivity() {
         recyclerView = findViewById(R.id.list_events)
         recyclerView.setLayoutManager(LinearLayoutManager(applicationContext))
 
-        populateHeaderMenu()
-
         // Set listeners
         findViewById<View>(R.id.logbooks_add_button).setOnClickListener {
             showAddLogbookDialog(true)
@@ -138,8 +136,6 @@ class MainActivity : AppCompatActivity() {
 
         allEvents = logbook?.logs ?: arrayListOf()
         setListAdapter(allEvents)
-
-        populateHeaderMenu()
     }
 
     private fun populateHeaderMenu() {
@@ -1127,6 +1123,8 @@ class MainActivity : AppCompatActivity() {
                     logbook = lb
                     showLogbook()
 
+                    populateHeaderMenu()
+
                     if (DEBUG_CHECK_LOGBOOK_CONSISTENCY) {
                         for (e in logbook?.logs ?: listOf()) {
                             val em = e.getHeaderEmoji(this@MainActivity)
@@ -1245,6 +1243,8 @@ class MainActivity : AppCompatActivity() {
                         Toast.LENGTH_SHORT
                     ).show()
                     savingEvent(false)
+
+                    populateHeaderMenu()
                 })
             }