diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 2f0cd211ce696daedd353efe37a7233b4893f3fb..deaa34406f4857c46fadaacb70d7d4440080bdaf 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -280,6 +280,9 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                 binding.drawer.getItemAdapter().add(item);
             }
         }
+
+        items.subList(4, 4 + tags.size()).sort((x, y) -> x.getTag() == null ? -1 : ((Comparable) x.getTag()).compareTo(y.getTag()));
+        binding.drawer.getItemAdapter().getFastAdapter().notifyDataSetChanged();
     }
 
     @Override