diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index bb752597..9700f843 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -125,6 +125,8 @@ Control {
         delegate: Rectangle {
             property variant modelData: model
 
+            ListView.delayRemove: true
+
             color: model.index == popup.currentIndex ? Nheko.colors.highlight : Nheko.colors.base
             height: chooser.child.implicitHeight + 2 * popup.rowMargin
             implicitWidth: fullWidth ? ListView.view.width : chooser.child.implicitWidth + 4
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 83cbb781..c75710cf 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -449,6 +449,7 @@ Item {
             anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
             width: chat.delegateMaxWidth
             height: section.active ? section.height + timelinerow.height : timelinerow.height
+            ListView.delayRemove: true
 
             Loader {
                 id: section