diff --git a/lib/pages/space_management_v2/modules/tags/presentation/widgets/add_device_type_widget.dart b/lib/pages/space_management_v2/modules/tags/presentation/widgets/add_device_type_widget.dart
index fa2af925..673efe7e 100644
--- a/lib/pages/space_management_v2/modules/tags/presentation/widgets/add_device_type_widget.dart
+++ b/lib/pages/space_management_v2/modules/tags/presentation/widgets/add_device_type_widget.dart
@@ -17,7 +17,7 @@ class AddDeviceTypeWidget extends StatelessWidget {
         ..add(const LoadProducts()),
       child: Builder(
         builder: (context) => AlertDialog(
-          title: const Text('Add Devices'),
+          title: const SelectableText('Add Devices'),
           backgroundColor: ColorsManager.whiteColors,
           content: BlocBuilder<ProductsBloc, ProductsState>(
             builder: (context, state) => switch (state) {
diff --git a/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_dialog.dart b/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_dialog.dart
index 706bc0a8..25f08d30 100644
--- a/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_dialog.dart
+++ b/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_dialog.dart
@@ -25,12 +25,10 @@ class AssignTagsDialog extends StatelessWidget {
       actions: [
         SpaceDetailsActionButtons(
           onSave: () {},
-          onCancel: () {
-            showDialog<void>(
-              context: context,
-              builder: (context) => const AddDeviceTypeWidget(),
-            );
-          },
+          onCancel: () => showDialog<void>(
+            context: context,
+            builder: (context) => const AddDeviceTypeWidget(),
+          ),
           cancelButtonLabel: 'Add New Device',
         ),
       ],
diff --git a/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_table.dart b/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_table.dart
index 03226b14..196b4102 100644
--- a/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_table.dart
+++ b/lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_table.dart
@@ -42,7 +42,8 @@ class _AssignTagsTableState extends State<AssignTagsTable> {
   }
 
   DataColumn _buildDataColumn(String label) {
-    return DataColumn(label: Text(label, style: context.textTheme.bodyMedium));
+    return DataColumn(
+        label: SelectableText(label, style: context.textTheme.bodyMedium));
   }
 
   @override
@@ -69,7 +70,7 @@ class _AssignTagsTableState extends State<AssignTagsTable> {
                   cells: [
                     DataCell(
                       Center(
-                        child: Text(
+                        child: SelectableText(
                           'No Devices Available',
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.lightGrayColor,
diff --git a/lib/pages/space_management_v2/modules/tags/presentation/widgets/products_grid.dart b/lib/pages/space_management_v2/modules/tags/presentation/widgets/products_grid.dart
index b01fb10f..7fe5ec26 100644
--- a/lib/pages/space_management_v2/modules/tags/presentation/widgets/products_grid.dart
+++ b/lib/pages/space_management_v2/modules/tags/presentation/widgets/products_grid.dart
@@ -25,31 +25,26 @@ class ProductsGrid extends StatelessWidget {
           color: ColorsManager.textFieldGreyColor,
           borderRadius: BorderRadius.circular(8),
         ),
-        child: Column(
-          children: [
-            const SizedBox(height: 16),
-            Expanded(
-              child: GridView.builder(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 20,
-                ),
-                shrinkWrap: true,
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: crossAxisCount,
-                  mainAxisSpacing: 6,
-                  crossAxisSpacing: 4,
-                  childAspectRatio: 0.8,
-                ),
-                itemCount: products.length,
-                itemBuilder: (context, index) => ProductTypeCard(
-                  product: products[index],
-                  count: 0,
-                  onIncrement: () {},
-                  onDecrement: () {},
-                ),
-              ),
+        child: Expanded(
+          child: GridView.builder(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 20,
             ),
-          ],
+            shrinkWrap: true,
+            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: crossAxisCount,
+              mainAxisSpacing: 6,
+              crossAxisSpacing: 4,
+              childAspectRatio: 0.8,
+            ),
+            itemCount: products.length,
+            itemBuilder: (context, index) => ProductTypeCard(
+              product: products[index],
+              count: 0,
+              onIncrement: () {},
+              onDecrement: () {},
+            ),
+          ),
         ),
       ),
     );