diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
index 074a88699e..cf6aa2302d 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
@@ -96,6 +96,7 @@ const CreateRoomDialog = ({
   const isRoomTitleChanged = roomParams.title.trim() !== "" ? false : true;
 
   const onKeyUpHandler = (e) => {
+    if (isWrongTitle) return;
     if (e.keyCode === 13) onCreateRoom();
   };
 
diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
index b26e34b402..62de4ea147 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
@@ -28,20 +28,23 @@ const EditRoomDialog = ({
   const prevRoomParams = useRef(
     Object.freeze({
       ...roomParams,
-    }),
+    })
   );
 
   const compareRoomParams = (prevParams, currentParams) => {
     return (
       prevParams.title === currentParams.title &&
       prevParams.roomOwner.id === currentParams.roomOwner.id &&
-      prevParams.tags.sort().toString() === currentParams.tags.sort().toString() &&
-      ((prevParams.icon.uploadedFile === "" && currentParams.icon.uploadedFile === null) ||
+      prevParams.tags.sort().toString() ===
+        currentParams.tags.sort().toString() &&
+      ((prevParams.icon.uploadedFile === "" &&
+        currentParams.icon.uploadedFile === null) ||
         prevParams.icon.uploadedFile === currentParams.icon.uploadedFile)
     );
   };
 
-  const setRoomTags = (newTags) => setRoomParams({ ...roomParams, tags: newTags });
+  const setRoomTags = (newTags) =>
+    setRoomParams({ ...roomParams, tags: newTags });
 
   const tagHandler = new TagHandler(roomParams.tags, setRoomTags, fetchedTags);
 
@@ -52,6 +55,7 @@ const EditRoomDialog = ({
     }));
 
   const onKeyUpHandler = (e) => {
+    if (isWrongTitle) return;
     if (e.keyCode === 13) onEditRoom();
   };
 
@@ -90,7 +94,8 @@ const EditRoomDialog = ({
       visible={visible}
       onClose={onCloseAction}
       isScrollLocked={isScrollLocked}
-      withFooterBorder>
+      withFooterBorder
+    >
       <ModalDialog.Header>
         <DialogHeader isEdit />
       </ModalDialog.Header>
@@ -121,7 +126,10 @@ const EditRoomDialog = ({
           primary
           scale
           onClick={onEditRoom}
-          isDisabled={isWrongTitle || compareRoomParams(prevRoomParams.current, roomParams)}
+          isDisabled={
+            isWrongTitle ||
+            compareRoomParams(prevRoomParams.current, roomParams)
+          }
           isLoading={isLoading}
         />
         <Button
diff --git a/packages/common/components/Navigation/Navigation.js b/packages/common/components/Navigation/Navigation.js
index e76492a977..f8273c0b54 100644
--- a/packages/common/components/Navigation/Navigation.js
+++ b/packages/common/components/Navigation/Navigation.js
@@ -95,6 +95,7 @@ const Navigation = ({
   );
 
   const toggleDropBox = () => {
+    if (navigationItems.length === 0) return;
     if (isRootFolder) return setIsOpen(false);
     setIsOpen((prev) => !prev);