diff --git a/backend/open_webui/constants.py b/backend/open_webui/constants.py
index 704cdd074..4e2ef008b 100644
--- a/backend/open_webui/constants.py
+++ b/backend/open_webui/constants.py
@@ -20,7 +20,9 @@ class ERROR_MESSAGES(str, Enum):
     def __str__(self) -> str:
         return super().__str__()
 
-    DEFAULT = lambda err="": f"Something went wrong :/\n[ERROR: {err if err else ''}]"
+    DEFAULT = (
+        lambda err="": f'{"Something went wrong :/" if err == "" else "[ERROR: " + err + "]"}'
+    )
     ENV_VAR_NOT_FOUND = "Required environment variable not found. Terminating now."
     CREATE_USER_ERROR = "Oops! Something went wrong while creating your account. Please try again later. If the issue persists, contact support for assistance."
     DELETE_USER_ERROR = "Oops! Something went wrong. We encountered an issue while trying to delete the user. Please give it another shot."
diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 5043d39d9..f92da0c54 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -99,13 +99,18 @@
 			return;
 		}
 
-		if (name.toLowerCase() in folders) {
+		if (Object.values(folders).find((folder) => folder.name.toLowerCase() === name.toLowerCase())) {
 			// If a folder with the same name already exists, append a number to the name
 			let i = 1;
-			while (name.toLowerCase() + ` ${i}` in folders) {
+			while (
+				Object.values(folders).find(
+					(folder) => folder.name.toLowerCase() === `${name} ${i}`.toLowerCase()
+				)
+			) {
 				i++;
 			}
-			name = name + ` ${i}`;
+
+			name = `${name} ${i}`;
 		}
 
 		const res = await createNewFolder(localStorage.token, name).catch((error) => {