diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 7d89184fe360c16667c75c9592cdb314e192f55a..caf820184f83eefdacdf9b7f10e2abde379c7f5f 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -402,6 +402,18 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             edit.setVisible(false);
             delete.setVisible(false);
         }
+        edit.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
+            @Override
+            public boolean onMenuItemActionCollapse(MenuItem item) {
+                binding.editTags.setVisibility(View.GONE);
+                if (save != null) save.setVisible(false);
+                populateView();
+                return true;
+            }
+
+            @Override
+            public boolean onMenuItemActionExpand(MenuItem item) { return true; }
+        });
         return super.onCreateOptionsMenu(menu);
     }