diff --git a/packages/ui/src/collapsible/collapsible.tsx b/packages/ui/src/collapsible/collapsible.tsx
index a069be3ed57..a0233086140 100644
--- a/packages/ui/src/collapsible/collapsible.tsx
+++ b/packages/ui/src/collapsible/collapsible.tsx
@@ -38,7 +38,6 @@ export const Collapsible: FC<TCollapsibleProps> = (props) => {
       </Disclosure.Button>
       <Transition
         show={localIsOpen}
-        className="overflow-hidden"
         enter="transition-max-height duration-400 ease-in-out"
         enterFrom="max-h-0"
         enterTo="max-h-screen"
diff --git a/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx b/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
index 7f0a47d88ca..f326804a329 100644
--- a/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
+++ b/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
@@ -45,10 +45,18 @@ export const NewFavoriteFolder = observer((props: TProps) => {
     formData = {
       entity_type: "folder",
       is_folder: true,
-      name: formData.name,
+      name: formData.name.trim(),
       parent: null,
       project_id: null,
     };
+
+    if (formData.name === "")
+      return setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Error!",
+        message: "Folder name cannot be empty",
+      });
+
     addFavorite(workspaceSlug.toString(), formData)
       .then(() => {
         setToast({
@@ -77,15 +85,31 @@ export const NewFavoriteFolder = observer((props: TProps) => {
         message: "Folder already exists",
       });
     const payload = {
-      name: formData.name,
+      name: formData.name.trim(),
     };
-    updateFavorite(workspaceSlug.toString(), favoriteId, payload).then(() => {
-      setToast({
-        type: TOAST_TYPE.SUCCESS,
-        title: "Success!",
-        message: "Favorite updated successfully.",
+
+    if (formData.name.trim() === "")
+      return setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Error!",
+        message: "Folder name cannot be empty",
+      });
+
+    updateFavorite(workspaceSlug.toString(), favoriteId, payload)
+      .then(() => {
+        setToast({
+          type: TOAST_TYPE.SUCCESS,
+          title: "Success!",
+          message: "Favorite updated successfully.",
+        });
+      })
+      .catch(() => {
+        setToast({
+          type: TOAST_TYPE.ERROR,
+          title: "Error!",
+          message: "Something went wrong!",
+        });
       });
-    });
     setCreateNewFolder(false);
     setValue("name", "");
   };