diff --git a/components/Chatbar/components/ChatFolders.tsx b/components/Chatbar/components/ChatFolders.tsx
index d6ee43a..faae6e2 100644
--- a/components/Chatbar/components/ChatFolders.tsx
+++ b/components/Chatbar/components/ChatFolders.tsx
@@ -49,6 +49,7 @@ export const ChatFolders = ({ searchTerm }: Props) => {
     <div className="flex w-full flex-col pt-2">
       {folders
         .filter((folder) => folder.type === 'chat')
+        .sort((a, b) => a.name.localeCompare(b.name))
         .map((folder, index) => (
           <Folder
             key={index}
diff --git a/components/Promptbar/components/PromptFolders.tsx b/components/Promptbar/components/PromptFolders.tsx
index 59c7762..5363241 100644
--- a/components/Promptbar/components/PromptFolders.tsx
+++ b/components/Promptbar/components/PromptFolders.tsx
@@ -49,6 +49,7 @@ export const PromptFolders = () => {
     <div className="flex w-full flex-col pt-2">
       {folders
         .filter((folder) => folder.type === 'prompt')
+        .sort((a, b) => a.name.localeCompare(b.name))
         .map((folder, index) => (
           <Folder
             key={index}