diff --git a/Makefile b/Makefile
index a8ba182..a847810 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 debug:
 	@cmake -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1
 	@cmake --build build
-	@cp build/compile_commands.json .
 
 ci:
 	@cmake -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cc
index a00f4df..d18c1cf 100644
--- a/src/timeline/TimelineView.cc
+++ b/src/timeline/TimelineView.cc
@@ -770,6 +770,10 @@ TimelineView::removeEvent(const QString &event_id)
         // Finally remove the event.
         removedItem->deleteLater();
         eventIds_.remove(event_id);
+
+        // Update the room list with a view of the last message after
+        // all events have been processed.
+        QTimer::singleShot(0, this, [this]() { notifyForLastEvent(); });
 }
 
 QWidget *