diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index fc6a8c88..fc085237 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -88,12 +88,7 @@ class TagChipDisplay extends StatelessWidget {
                           ),
                         ),
                       ),
-                  EditChip(onTap: () async {
-                    // Use the Navigator's context for showDialog
-                    Navigator.of(context).pop();
-
-                    await showDialog<bool>(
-                        barrierDismissible: false,
+                  EditChip(onTap: () => showDialog<bool>(
                         context: context,
                         builder: (context) => AssignTagModelsDialog(
                               products: products,
@@ -110,18 +105,14 @@ class TagChipDisplay extends StatelessWidget {
                                   spaceModel?.tags ?? [], subspaces),
                               spaceName: spaceModel?.modelName ?? '',
                               projectTags: projectTags,
-                            ));
-                  })
+                            )))
                 ],
               ),
             ),
           )
         : TextButton(
-            onPressed: () async {
-              Navigator.of(context).pop();
-
-              await showDialog<bool>(
-                barrierDismissible: false,
+            onPressed: () {
+              showDialog<void>(
                 context: context,
                 builder: (context) => AddDeviceTypeModelWidget(
                   products: products,