diff --git a/Sources/FioriSwiftUICore/Views/OptionListPickerItem+View.swift b/Sources/FioriSwiftUICore/Views/OptionListPickerItem+View.swift
index 6f1ff5901..1dbe861e0 100644
--- a/Sources/FioriSwiftUICore/Views/OptionListPickerItem+View.swift
+++ b/Sources/FioriSwiftUICore/Views/OptionListPickerItem+View.swift
@@ -71,7 +71,9 @@ extension OptionListPickerItem: View {
                 }
             )
         }
-        .frame(height: _height)
+        .ifApply(UIDevice.current.userInterfaceIdiom == .phone, content: { v in
+            v.frame(height: _height)
+        })
     }
     
     private func generateFlexibleContent() -> some View {
@@ -102,7 +104,9 @@ extension OptionListPickerItem: View {
                 }
             )
         }
-        .frame(height: _height)
+        .ifApply(UIDevice.current.userInterfaceIdiom == .phone, content: { v in
+            v.frame(height: _height)
+        })
     }
     
     private func getSafeAreaInsets() -> UIEdgeInsets {
diff --git a/Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+View.swift b/Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+View.swift
index 55b848b42..a9a0ed059 100644
--- a/Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+View.swift
+++ b/Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+View.swift
@@ -183,6 +183,9 @@ struct PickerMenuItem: View {
                     }
                     .padding([.leading, .trailing], UIDevice.current.userInterfaceIdiom == .pad ? 13 : 16)
                 }
+                .ifApply(UIDevice.current.userInterfaceIdiom != .phone, content: { v in
+                    v.frame(minHeight: 155)
+                })
                 .readHeight()
                 .onPreferenceChange(HeightPreferenceKey.self) { height in
                     if let height {