diff --git a/src/components/fields/ComboBox/ComboBox.tsx b/src/components/fields/ComboBox/ComboBox.tsx
index 81e676629..3bbbfc230 100644
--- a/src/components/fields/ComboBox/ComboBox.tsx
+++ b/src/components/fields/ComboBox/ComboBox.tsx
@@ -929,7 +929,7 @@ function ComboBoxOverlay({
               headingStyles={headingStyles}
               stateRef={listStateRef}
               size="medium"
-              type="popover"
+              shape="popover"
               onSelectionChange={onSelectionChange}
             >
               {children as any}
diff --git a/src/components/fields/FilterListBox/FilterListBox.tsx b/src/components/fields/FilterListBox/FilterListBox.tsx
index e1620daae..cc5135a78 100644
--- a/src/components/fields/FilterListBox/FilterListBox.tsx
+++ b/src/components/fields/FilterListBox/FilterListBox.tsx
@@ -103,7 +103,7 @@ const StyledHeaderWithoutBorder = tasty(StyledHeader, {
 });
 
 export interface CubeFilterListBoxProps<T>
-  extends Omit<CubeListBoxProps<T>, 'filter' | 'type'>,
+  extends Omit<CubeListBoxProps<T>, 'filter'>,
     FieldBaseProps {
   /** Placeholder text for the search input */
   searchPlaceholder?: string;
diff --git a/src/components/fields/FilterPicker/FilterPicker.tsx b/src/components/fields/FilterPicker/FilterPicker.tsx
index ab73d2ad0..608ecd74a 100644
--- a/src/components/fields/FilterPicker/FilterPicker.tsx
+++ b/src/components/fields/FilterPicker/FilterPicker.tsx
@@ -57,7 +57,7 @@ interface ItemWithKey {
 }
 
 export interface CubeFilterPickerProps<T>
-  extends Omit<CubeFilterListBoxProps<T>, 'size' | 'tooltip'>,
+  extends Omit<CubeFilterListBoxProps<T>, 'size' | 'tooltip' | 'shape'>,
     Omit<CubeItemProps, 'children' | 'size'>,
     BasePropsWithoutChildren,
     BaseStyleProps,
diff --git a/src/components/fields/Picker/Picker.tsx b/src/components/fields/Picker/Picker.tsx
index 4ff5d0fe5..efe49bffc 100644
--- a/src/components/fields/Picker/Picker.tsx
+++ b/src/components/fields/Picker/Picker.tsx
@@ -44,7 +44,7 @@ import { CubeListBoxProps, ListBox } from '../ListBox/ListBox';
 import type { FieldBaseProps } from '../../../shared';
 
 export interface CubePickerProps<T>
-  extends Omit<CubeListBoxProps<T>, 'size' | 'tooltip' | 'type'>,
+  extends Omit<CubeListBoxProps<T>, 'size' | 'tooltip' | 'shape'>,
     Omit<CubeItemProps, 'children' | 'size'>,
     BasePropsWithoutChildren,
     BaseStyleProps,
@@ -683,7 +683,7 @@ export const Picker = forwardRef(function Picker<T extends object>(
                 isLoading={isLoading}
                 stateRef={internalListStateRef}
                 isCheckable={isCheckable}
-                type="popover"
+                shape="popover"
                 size="medium"
                 showSelectAll={showSelectAll}
                 selectAllLabel={selectAllLabel}