diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt
similarity index 98%
rename from backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt.kt
rename to backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt
index c9896bc38a..5e4d647902 100644
--- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt.kt
+++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt
@@ -122,7 +122,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() {
                 existingReportingDTO.reporting.copy(
                     missionId = 38,
                     attachedToMissionAtUtc =
-                    ZonedDateTime.parse("2023-04-01T00:00:00Z"),
+                        ZonedDateTime.parse("2023-04-01T00:00:00Z"),
                 ),
             )
         assertThat(reportingWithMissionDTO.reporting.attachedEnvActionId).isNull()
@@ -132,7 +132,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() {
         jpaReportingRepository.save(
             reportingWithMissionDTO.reporting.copy(
                 attachedEnvActionId =
-                UUID.fromString("e2257638-ddef-4611-960c-7675a3254c38"),
+                    UUID.fromString("e2257638-ddef-4611-960c-7675a3254c38"),
             ),
         )
 
@@ -346,7 +346,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() {
                 jpaReportingRepository.save(
                     existingReportingDTO.reporting.copy(
                         attachedEnvActionId =
-                        UUID.fromString("e2257638-ddef-4611-960c-7675a3254c38"),
+                            UUID.fromString("e2257638-ddef-4611-960c-7675a3254c38"),
                     ),
                 )
             }
@@ -373,7 +373,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() {
                     existingReportingDTO.reporting.copy(
                         missionId = 42,
                         attachedEnvActionId =
-                        UUID.fromString("e2257638-ddef-4611-960c-7675a3254c38"),
+                            UUID.fromString("e2257638-ddef-4611-960c-7675a3254c38"),
                     ),
                 )
             }
@@ -398,7 +398,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() {
                     existingReportingDTO.reporting.copy(
                         missionId = 100,
                         attachedToMissionAtUtc =
-                        ZonedDateTime.parse("2023-04-01T00:00:00Z"),
+                            ZonedDateTime.parse("2023-04-01T00:00:00Z"),
                     ),
                 )
             }
@@ -421,7 +421,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() {
                 jpaReportingRepository.save(
                     existingReportingDTO.reporting.copy(
                         detachedFromMissionAtUtc =
-                        ZonedDateTime.parse("2023-04-01T00:00:00Z"),
+                            ZonedDateTime.parse("2023-04-01T00:00:00Z"),
                     ),
                 )
             }
diff --git a/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitContactList/FormikNameSelect.tsx b/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitContactList/FormikNameSelect.tsx
index 801e870db0..1463e9b8e3 100644
--- a/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitContactList/FormikNameSelect.tsx
+++ b/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitContactList/FormikNameSelect.tsx
@@ -31,6 +31,7 @@ export function FormikNameSelect() {
     (nextName: string | undefined) => {
       if (nextName === 'SWITCH_TO_CUSTOM_NAME') {
         setIsCustomName(true)
+        helpers.setValue(undefined)
 
         return
       }
diff --git a/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitResourceList/Item.tsx b/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitResourceList/Item.tsx
index f9a6918aaa..bd471a9310 100644
--- a/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitResourceList/Item.tsx
+++ b/frontend/src/features/ControlUnit/components/ControlUnitDialog/ControlUnitResourceList/Item.tsx
@@ -31,7 +31,7 @@ export function Item({ controlUnitResource, onEdit }: ItemProps) {
             <IconButton accent={Accent.TERTIARY} Icon={Icon.Edit} onClick={handleEdit} title="Éditer ce moyen" />
           </div>
         </InfoBoxHeader>
-        <p>{controlUnitResource.note}</p>
+        {controlUnitResource.note && <Note>{controlUnitResource.note}</Note>}
       </InfoBox>
     </Wrapper>
   )
@@ -51,9 +51,9 @@ const InfoBox = styled.div`
 
 const InfoBoxHeader = styled.div`
   display: flex;
+
   margin-bottom: 8px;
   color: ${p => p.theme.color.gunMetal};
-
   > div:first-child {
     display: flex;
     flex-direction: column;
@@ -61,6 +61,13 @@ const InfoBoxHeader = styled.div`
   }
 `
 
+const Note = styled.div`
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  display: -webkit-box;
+  overflow: hidden;
+`
+
 const Name = styled.p`
   font-weight: bold;
 `
diff --git a/frontend/src/features/ControlUnit/components/ControlUnitDialog/shared/TextareaForm.tsx b/frontend/src/features/ControlUnit/components/ControlUnitDialog/shared/TextareaForm.tsx
index d775730289..fb75434c66 100644
--- a/frontend/src/features/ControlUnit/components/ControlUnitDialog/shared/TextareaForm.tsx
+++ b/frontend/src/features/ControlUnit/components/ControlUnitDialog/shared/TextareaForm.tsx
@@ -14,6 +14,15 @@ export function TextareaForm({ controlUnit, isLabelHidden, label, name, onSubmit
   const [isEditing, setIsEditing] = useState(false)
   const [value, setValue] = useState<string | undefined>(controlUnit[name])
 
+  const cancel = () => {
+    setIsEditing(false)
+    setValue(controlUnit[name])
+  }
+
+  const edit = () => {
+    setIsEditing(true)
+  }
+
   const moveCursorToEnd = useCallback((event: ChangeEvent<HTMLTextAreaElement>) => {
     event.target.setSelectionRange(event.target.value.length, event.target.value.length)
   }, [])
@@ -31,10 +40,6 @@ export function TextareaForm({ controlUnit, isLabelHidden, label, name, onSubmit
     setIsEditing(false)
   }
 
-  const toggleIsEditing = useCallback(() => {
-    setIsEditing(!isEditing)
-  }, [isEditing])
-
   if (isEditing) {
     return (
       <Form onSubmit={updateControlUnit}>
@@ -51,7 +56,7 @@ export function TextareaForm({ controlUnit, isLabelHidden, label, name, onSubmit
           value={value}
         />
         <div>
-          <Button accent={Accent.SECONDARY} onClick={toggleIsEditing}>
+          <Button accent={Accent.SECONDARY} onClick={cancel}>
             Annuler
           </Button>
           <Button type="submit">Valider</Button>
@@ -64,7 +69,7 @@ export function TextareaForm({ controlUnit, isLabelHidden, label, name, onSubmit
     <>
       {!isLabelHidden && <Label>{label}</Label>}
       {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions */}
-      <TextBox data-cy={`ControlUnitDialog-${name}`} onClick={toggleIsEditing}>
+      <TextBox data-cy={`ControlUnitDialog-${name}`} onClick={edit}>
         {controlUnit[name]}
       </TextBox>
     </>