diff --git a/lib/pages/spaces_management/widgets/dialogs/create_space_dialog.dart b/lib/pages/spaces_management/widgets/dialogs/create_space_dialog.dart
index 4a0c0ca4..62d9fe0e 100644
--- a/lib/pages/spaces_management/widgets/dialogs/create_space_dialog.dart
+++ b/lib/pages/spaces_management/widgets/dialogs/create_space_dialog.dart
@@ -45,14 +45,14 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     selectedIcon = widget.icon ?? Assets.location;
     nameController = TextEditingController(text: widget.name ?? '');
     selectedProducts = widget.selectedProducts.isNotEmpty ? widget.selectedProducts : [];
-    isOkButtonEnabled = enteredName.isNotEmpty || widget.name!.isNotEmpty;
+    isOkButtonEnabled = enteredName.isNotEmpty || nameController.text.isNotEmpty;
+    isNameFieldInvalid = nameController.text.isEmpty;
   }
 
   @override
   @override
   Widget build(BuildContext context) {
     final screenWidth = MediaQuery.of(context).size.width;
-    final screenHeight = MediaQuery.of(context).size.height;
 
     return AlertDialog(
       title: widget.isEdit ? const Text('Edit Space') : const Text('Create New Space'),
@@ -121,6 +121,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                 isOkButtonEnabled = true;
                                 isNameFieldInvalid = false;
                               } else {
+                                isNameFieldInvalid = true;
                                 isOkButtonEnabled = false;
                               }
                             });
@@ -233,7 +234,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
             Expanded(
               child: DefaultButton(
                 onPressed: () {
-                  if (enteredName.trim().isEmpty || widget.name!.isEmpty) {
+                  if (nameController.text.isEmpty) {
                     setState(() {
                       isNameFieldInvalid = true;
                     });