diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart
index 081135ef2..6bf6a76c4 100644
--- a/flutter/lib/common/widgets/address_book.dart
+++ b/flutter/lib/common/widgets/address_book.dart
@@ -153,9 +153,10 @@ class _AddressBookState extends State<AddressBook> {
                     child: Obx(
                       () => Wrap(
                         children: gFFI.abModel.tags
-                            .map((e) => buildTag(e, gFFI.abModel.selectedTags,
-                                    onTap: () {
-                                  //
+                            .map((e) => AddressBookTag(
+                                name: e,
+                                tags: gFFI.abModel.selectedTags,
+                                onTap: () {
                                   if (gFFI.abModel.selectedTags.contains(e)) {
                                     gFFI.abModel.selectedTags.remove(e);
                                   } else {
@@ -183,41 +184,6 @@ class _AddressBookState extends State<AddressBook> {
     );
   }
 
-  Widget buildTag(String tagName, RxList<dynamic> rxTags, {Function()? onTap}) {
-    return ContextMenuArea(
-      width: 100,
-      builder: (context) => [
-        ListTile(
-          title: Text(translate("Delete")),
-          onTap: () {
-            gFFI.abModel.deleteTag(tagName);
-            gFFI.abModel.pushAb();
-            Future.delayed(Duration.zero, () => Get.back());
-          },
-        )
-      ],
-      child: GestureDetector(
-        onTap: onTap,
-        child: Obx(
-          () => Container(
-            decoration: BoxDecoration(
-                color: rxTags.contains(tagName) ? Colors.blue : null,
-                border: Border.all(color: MyTheme.darkGray),
-                borderRadius: BorderRadius.circular(6)),
-            margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
-            padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0),
-            child: Text(
-              tagName,
-              style: TextStyle(
-                  color:
-                      rxTags.contains(tagName) ? Colors.white : null), // TODO
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
   /// tag operation
   void handleAbOp(String value) {
     if (value == 'add-id') {
@@ -366,54 +332,55 @@ class _AddressBookState extends State<AddressBook> {
       );
     });
   }
+}
 
-  void abEditTag(String id) {
-    var isInProgress = false;
+class AddressBookTag extends StatelessWidget {
+  final String name;
+  final RxList<dynamic> tags;
+  final Function()? onTap;
+  final bool useContextMenuArea;
 
-    final tags = List.of(gFFI.abModel.tags);
-    var selectedTag = gFFI.abModel.getPeerTags(id).obs;
+  const AddressBookTag(
+      {Key? key,
+      required this.name,
+      required this.tags,
+      this.onTap,
+      this.useContextMenuArea = true})
+      : super(key: key);
 
-    gFFI.dialogManager.show((setState, close) {
-      submit() async {
-        setState(() {
-          isInProgress = true;
-        });
-        gFFI.abModel.changeTagForPeer(id, selectedTag);
-        await gFFI.abModel.pushAb();
-        close();
-      }
-
-      return CustomAlertDialog(
-        title: Text(translate("Edit Tag")),
-        content: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Container(
-              padding:
-                  const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
-              child: Wrap(
-                children: tags
-                    .map((e) => buildTag(e, selectedTag, onTap: () {
-                          if (selectedTag.contains(e)) {
-                            selectedTag.remove(e);
-                          } else {
-                            selectedTag.add(e);
-                          }
-                        }))
-                    .toList(growable: false),
-              ),
-            ),
-            Offstage(
-                offstage: !isInProgress, child: const LinearProgressIndicator())
-          ],
+  @override
+  Widget build(BuildContext context) {
+    final body = GestureDetector(
+      onTap: onTap,
+      child: Obx(
+        () => Container(
+          decoration: BoxDecoration(
+              color: tags.contains(name) ? Colors.blue : null,
+              border: Border.all(color: MyTheme.darkGray),
+              borderRadius: BorderRadius.circular(6)),
+          margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
+          padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0),
+          child: Text(name,
+              style:
+                  TextStyle(color: tags.contains(name) ? Colors.white : null)),
         ),
-        actions: [
-          TextButton(onPressed: close, child: Text(translate("Cancel"))),
-          TextButton(onPressed: submit, child: Text(translate("OK"))),
-        ],
-        onSubmit: submit,
-        onCancel: close,
-      );
-    });
+      ),
+    );
+    return useContextMenuArea
+        ? ContextMenuArea(
+            width: 100,
+            builder: (context) => [
+              ListTile(
+                title: Text(translate("Delete")),
+                onTap: () {
+                  gFFI.abModel.deleteTag(name);
+                  gFFI.abModel.pushAb();
+                  Future.delayed(Duration.zero, () => Get.back());
+                },
+              )
+            ],
+            child: body,
+          )
+        : body;
   }
 }
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index d4a418262..ce925984e 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -1,6 +1,6 @@
-import 'package:contextmenu/contextmenu.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_hbb/common/widgets/address_book.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:get/get.dart';
 
@@ -774,7 +774,9 @@ class AddressBookPeerCard extends BasePeerCard {
     if (await bind.mainPeerHasPassword(id: peer.id)) {
       menuItems.add(_unrememberPasswordAction(peer.id));
     }
-    menuItems.add(_editTagAction(peer.id));
+    if (gFFI.abModel.tags.isNotEmpty) {
+      menuItems.add(_editTagAction(peer.id));
+    }
     return menuItems;
   }
 
@@ -836,17 +838,20 @@ class AddressBookPeerCard extends BasePeerCard {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Container(
-              padding:
-                  const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+              padding: const EdgeInsets.symmetric(vertical: 8.0),
               child: Wrap(
                 children: tags
-                    .map((e) => _buildTag(e, selectedTag, onTap: () {
+                    .map((e) => AddressBookTag(
+                        name: e,
+                        tags: selectedTag,
+                        onTap: () {
                           if (selectedTag.contains(e)) {
                             selectedTag.remove(e);
                           } else {
                             selectedTag.add(e);
                           }
-                        }))
+                        },
+                        useContextMenuArea: false))
                     .toList(growable: false),
               ),
             ),
@@ -863,41 +868,6 @@ class AddressBookPeerCard extends BasePeerCard {
       );
     });
   }
-
-  Widget _buildTag(String tagName, RxList<dynamic> rxTags,
-      {Function()? onTap}) {
-    return ContextMenuArea(
-      width: 100,
-      builder: (context) => [
-        ListTile(
-          title: Text(translate("Delete")),
-          onTap: () {
-            gFFI.abModel.deleteTag(tagName);
-            gFFI.abModel.pushAb();
-            Future.delayed(Duration.zero, () => Get.back());
-          },
-        )
-      ],
-      child: GestureDetector(
-        onTap: onTap,
-        child: Obx(
-          () => Container(
-            decoration: BoxDecoration(
-                color: rxTags.contains(tagName) ? Colors.blue : null,
-                border: Border.all(color: MyTheme.darkGray),
-                borderRadius: BorderRadius.circular(10)),
-            margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
-            padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0),
-            child: Text(
-              tagName,
-              style: TextStyle(
-                  color: rxTags.contains(tagName) ? Colors.white : null),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
 }
 
 void _rdpDialog(String id) async {