diff --git a/mon-entreprise/source/components/conversation/select/SelectCommune.tsx b/mon-entreprise/source/components/conversation/select/SelectCommune.tsx
index 056449af7..0ee32fe56 100644
--- a/mon-entreprise/source/components/conversation/select/SelectCommune.tsx
+++ b/mon-entreprise/source/components/conversation/select/SelectCommune.tsx
@@ -150,8 +150,8 @@ export default function Select({ onChange, value }) {
 			<input
 				role="combobox"
 				type="search"
-				onBlur={submitFocusedElem}
 				aria-autocomplete="list"
+				onBlur={submitFocusedElem}
 				aria-readonly="true"
 				css={noResult ? 'border-color: firebrick !important' : ''}
 				className="ui__"
@@ -186,9 +186,14 @@ export default function Select({ onChange, value }) {
 							const nom = formatCommune(result)
 							return (
 								<Option
+									onMouseDown={
+										// Prevent input blur and focus elem selection
+										e => e.preventDefault()
+									}
 									onClick={() => handleSubmit(result)}
 									role="option"
 									focused={i === focusedElem}
+									data-role="commune-option"
 									key={nom}
 									onFocus={() => setFocusedElem(i)}
 								>
diff --git a/publicodes/source/components/Overlay.tsx b/publicodes/source/components/Overlay.tsx
index 0e8771cb4..f4b82a52b 100644
--- a/publicodes/source/components/Overlay.tsx
+++ b/publicodes/source/components/Overlay.tsx
@@ -7,6 +7,11 @@ type OverlayProps = React.HTMLAttributes<HTMLDivElement> & {
 	xPosition?: number
 	children: React.ReactNode
 }
+declare global {
+	interface Window {
+		parentIFrame?: any
+	}
+}
 
 const useIFrameOffset = () => {
 	const [offsetTop, setOffset] = useState<number | null>(null)