diff --git a/components/konstitisyon/comments/create-comment.js b/components/konstitisyon/comments/create-comment.js
deleted file mode 100644
index 69f9f40..0000000
--- a/components/konstitisyon/comments/create-comment.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client'
-
-import CreateForm from '../forms/create-form.js'
-
-export default function CreateComment(props) {
-  return (
-    <CreateForm
-      {...props}
-      collection='commentaires'
-      dialogText='Écrivez votre commentaire'
-      label='commentaire'
-    />
-  )
-}
diff --git a/components/konstitisyon/forms/create-form.js b/components/konstitisyon/create/create-form.js
similarity index 100%
rename from components/konstitisyon/forms/create-form.js
rename to components/konstitisyon/create/create-form.js
diff --git a/components/konstitisyon/create/create-titre.js b/components/konstitisyon/create/create-titre.js
deleted file mode 100644
index d9a022e..0000000
--- a/components/konstitisyon/create/create-titre.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client'
-
-import CreateForm from '../forms/create-form.js'
-
-export default function CreateTitre(props) {
-  return (
-    <CreateForm
-      {...props}
-      collection='titres'
-      dialogText='Écrivez votre titre'
-      label='titre'
-    />
-  )
-}
diff --git a/components/konstitisyon/create/handle-create.js b/components/konstitisyon/create/handle-create.js
index 403dbbd..a9c43e4 100644
--- a/components/konstitisyon/create/handle-create.js
+++ b/components/konstitisyon/create/handle-create.js
@@ -1,8 +1,9 @@
 import PropTypes from 'prop-types'
-import CreateTitre from './create-titre.js'
+import CreateForm from './create-form.js'
 
 export default function HandleCreate({
   session,
+  selectedTitre,
   isOpen,
   setIsOpen,
   setError,
@@ -13,7 +14,7 @@ export default function HandleCreate({
 }) {
   if (collection === 'titres') {
     return (
-      <CreateTitre
+      <CreateForm
         session={session}
         isOpen={isOpen}
         setIsOpen={setIsOpen}
@@ -21,9 +22,30 @@ export default function HandleCreate({
         setSuccess={setSuccess}
         setIsErrorAlertOpen={setIsErrorAlertOpen}
         setIsSuccessAlertOpen={setIsSuccessAlertOpen}
-        title='Titre'
-        label='Écrivez votre titre'
         hasMultiline={false}
+        title='Titre'
+        collection={collection}
+        dialogText='Écrivez votre titre'
+        label='titre'
+      />
+    )
+  }
+
+  if (collection === 'commentaires') {
+    return (
+      <CreateForm
+        session={session}
+        selectedTitre={selectedTitre}
+        isOpen={isOpen}
+        setIsOpen={setIsOpen}
+        setError={setError}
+        setSuccess={setSuccess}
+        setIsErrorAlertOpen={setIsErrorAlertOpen}
+        setIsSuccessAlertOpen={setIsSuccessAlertOpen}
+        title={selectedTitre.titre}
+        collection={collection}
+        dialogText='Écrivez votre commentaire'
+        label='commentaire'
       />
     )
   }
@@ -31,6 +53,7 @@ export default function HandleCreate({
 
 HandleCreate.propTypes = {
   session: PropTypes.object,
+  selectedTitre: PropTypes.object,
   isOpen: PropTypes.bool.isRequired,
   setIsOpen: PropTypes.func.isRequired,
   setError: PropTypes.func.isRequired,
diff --git a/components/konstitisyon/index.js b/components/konstitisyon/index.js
index ec72024..9cbf44a 100644
--- a/components/konstitisyon/index.js
+++ b/components/konstitisyon/index.js
@@ -11,7 +11,7 @@ import Tooltip, {tooltipClasses} from '@mui/material/Tooltip'
 import AuthAlert from '../auth-form/auth-alert.js'
 import Titre from './titre.js'
 import Article from './article.js'
-import HandleComments from './comments/handle-comments.js'
+import HandleCreate from './create/handle-create.js'
 import {formatKonstitisyon} from '@/lib/format.js'
 
 const LightTooltip = styled(({className, ...props}) => (
@@ -84,8 +84,8 @@ export default function Konstitisyon({session, titres, articles}) {
             )}
           </Paper>
         ))}
-        {selectedTitre && (
-          <HandleComments
+        {selectedTitre && operation === 'create' && (
+          <HandleCreate
             session={session}
             selectedTitre={selectedTitre}
             isOpen={isDialogOpen}
@@ -94,7 +94,7 @@ export default function Konstitisyon({session, titres, articles}) {
             setSuccess={setSuccess}
             setIsErrorAlertOpen={setIsErrorAlertOpen}
             setIsSuccessAlertOpen={setIsSuccessAlertOpen}
-            operation={operation}
+            collection='commentaires'
           />
         )}
       </Box>