diff --git a/src/components/Collapse.tsx b/src/components/Collapse.tsx
index 4007cae0..cb05d5b0 100644
--- a/src/components/Collapse.tsx
+++ b/src/components/Collapse.tsx
@@ -70,6 +70,7 @@ export const Collapse = ({
     variant === 'plus' && 'collapse-plus',
     bordered && 'border base-content/20 border-opacity-20 rounded-box',
     disabled && 'opacity-60 pointer-events-none',
+    !open && 'w-fit',
     className
   );
 
@@ -82,7 +83,7 @@ export const Collapse = ({
         </div>
       );
     }
-    return <div>{title}</div>;
+    return title;
   }, [title, subtitle]);
 
   return (
@@ -102,7 +103,7 @@ export const Collapse = ({
         role='button'
         tabIndex={0}
         className={cn(
-          'collapse-title p-0',
+          'collapse-title w-fit p-0',
           'focus:outline-none focus-visible:ring focus-visible:ring-primary/40',
           titleClassName
         )}