diff --git a/src/Frontend/Components/Autocomplete/Autocomplete.tsx b/src/Frontend/Components/Autocomplete/Autocomplete.tsx
index d366a0681..53b5a5c10 100644
--- a/src/Frontend/Components/Autocomplete/Autocomplete.tsx
+++ b/src/Frontend/Components/Autocomplete/Autocomplete.tsx
@@ -225,18 +225,17 @@ export function Autocomplete<
     }
 
     return (
-      <EndAdornmentContainer>
+      <EndAdornmentContainer
+        onClick={(event) => event.stopPropagation()}
+        onMouseDown={(event) => event.stopPropagation()}
+      >
         {hasClearButton && (
-          <ClearButton
-            {...(getClearProps() as MuiIconButtonProps)}
-            onMouseDown={(event) => event.stopPropagation()}
-          />
+          <ClearButton {...(getClearProps() as MuiIconButtonProps)} />
         )}
         {hasPopupIndicator && (
           <PopupIndicator
             popupOpen={isPopupOpen}
             {...(getPopupIndicatorProps() as MuiIconButtonProps)}
-            onClick={undefined}
           />
         )}
         {endAdornment}
diff --git a/src/Frontend/Components/IconButton/IconButton.tsx b/src/Frontend/Components/IconButton/IconButton.tsx
index e40735969..4d373f148 100644
--- a/src/Frontend/Components/IconButton/IconButton.tsx
+++ b/src/Frontend/Components/IconButton/IconButton.tsx
@@ -13,7 +13,7 @@ interface IconButtonProps {
   tooltipPlacement?: TooltipProps['placement'];
   iconSx?: SxProps;
   containerSx?: SxProps;
-  onClick?(): void;
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
   icon: ReactElement;
   disabled?: boolean;
   hidden?: boolean;
@@ -39,7 +39,7 @@ export function IconButton(props: IconButtonProps) {
           sx={props.iconSx}
           onClick={(event) => {
             event.stopPropagation();
-            props.onClick?.();
+            props.onClick?.(event);
           }}
           disabled={props.disabled}
           data-testid={props['data-testid']}