diff --git a/packages/pluggableWidgets/gallery-native/CHANGELOG.md b/packages/pluggableWidgets/gallery-native/CHANGELOG.md
index 18940f590..1ee503bbf 100644
--- a/packages/pluggableWidgets/gallery-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/gallery-native/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+-   We've fixed an issue where Gallery widget does not display data.
+
 ## [2.1.0] - 2026-4-10
 
 ### Changed
diff --git a/packages/pluggableWidgets/gallery-native/package.json b/packages/pluggableWidgets/gallery-native/package.json
index 57b21044d..5360338e4 100644
--- a/packages/pluggableWidgets/gallery-native/package.json
+++ b/packages/pluggableWidgets/gallery-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gallery-native",
   "widgetName": "Gallery",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A flexible gallery widget that renders columns, rows and layouts.",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/gallery-native/src/components/Gallery.tsx b/packages/pluggableWidgets/gallery-native/src/components/Gallery.tsx
index 956a1cfc1..54c2de07c 100644
--- a/packages/pluggableWidgets/gallery-native/src/components/Gallery.tsx
+++ b/packages/pluggableWidgets/gallery-native/src/components/Gallery.tsx
@@ -1,5 +1,14 @@
-import { ReactElement, ReactNode, useCallback, useMemo } from "react";
-import { Text, Pressable, View, ViewProps, Platform, TouchableOpacity, useWindowDimensions } from "react-native";
+import { ReactElement, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+    LayoutChangeEvent,
+    Text,
+    Pressable,
+    View,
+    ViewProps,
+    Platform,
+    TouchableOpacity,
+    useWindowDimensions
+} from "react-native";
 import { ObjectItem, DynamicValue } from "mendix";
 import DeviceInfo from "react-native-device-info";
 import { GalleryStyle } from "../ui/Styles";
@@ -35,6 +44,13 @@ export const Gallery = <T extends ObjectItem>(props: GalleryProps<T>): ReactElem
     const lastItemId = props.items?.[props.items.length - 1]?.id;
     const { name, style, itemRenderer } = props;
     const { width } = useWindowDimensions();
+    // FlashList requires a non-zero height to render items (it's virtualized and needs viewport dimensions).
+    // When the parent provides height (e.g. via flex), we use flex: 1. When it doesn't (e.g. a Container
+    // widget with no flex/height), flex: 1 resolves to 0 and nothing renders. In that case, we fall back
+    // to minHeight based on FlashList's reported content size. We measure the FlashList area specifically so we get the height of the list area, not the entire Gallery (which may include filters and padding).
+    const listAreaRef = useRef<View>(null);
+    const [contentHeight, setContentHeight] = useState(0);
+    const [layoutDecision, setLayoutDecision] = useState<"minHeight" | "flex" | null>(null);
 
     const onEndReached = (): void => {
         if (props.pagination === "virtualScrolling" && props.hasMoreItems) {
@@ -137,29 +153,62 @@ export const Gallery = <T extends ObjectItem>(props: GalleryProps<T>): ReactElem
         [props.style.emptyPlaceholder, props.emptyPlaceholder]
     );
 
+    const handleListAreaLayout = useCallback(
+        (event: LayoutChangeEvent) => {
+            const { height } = event.nativeEvent.layout;
+            if (height > 0 && layoutDecision === null) {
+                setLayoutDecision("flex");
+            }
+        },
+        [layoutDecision]
+    );
+
+    useEffect(() => {
+        if (contentHeight > 0 && layoutDecision === null && listAreaRef.current) {
+            listAreaRef.current.measure((_x, _y, _width, height) => {
+                setLayoutDecision(height > 0 ? "flex" : "minHeight");
+            });
+        }
+    }, [contentHeight, layoutDecision]);
+
+    const containerStyle = isScrollDirectionVertical
+        ? layoutDecision === "minHeight"
+            ? [{ minHeight: Math.max(contentHeight, 1) }, props.style.container]
+            : [{ flex: 1 }, props.style.container]
+        : props.style.container;
+
+    const listStyle = isScrollDirectionVertical ? [{ flex: 1 }, props.style.list] : props.style.list;
+
     return (
-        <View testID={`${name}`} style={props.style.container}>
+        <View testID={`${name}`} style={containerStyle}>
             {props.filters ? <View>{props.filters}</View> : null}
-            <FlashList
-                {...(isScrollDirectionVertical && props.pullDown ? { onRefresh: props.pullDown } : {})}
-                {...(isScrollDirectionVertical ? { numColumns } : {})}
-                ListFooterComponent={loadMoreButton}
-                ListFooterComponentStyle={{
-                    ...props.style.loadMoreButtonContainer,
-                    ...(isScrollDirectionVertical ? { marginTop: 8 } : { marginStart: 8 })
-                }}
-                refreshing={props.pullDownIsExecuting}
-                data={props.items}
-                horizontal={!isScrollDirectionVertical}
-                keyExtractor={item => item.id}
-                ListEmptyComponent={renderEmptyPlaceholder}
-                onEndReached={onEndReached}
-                onEndReachedThreshold={0.6}
-                scrollEventThrottle={50}
-                renderItem={renderItem}
-                style={props.style.list}
-                testID={`${name}-list`}
-            />
+            <View
+                ref={listAreaRef}
+                style={isScrollDirectionVertical ? { flex: 1 } : undefined}
+                onLayout={isScrollDirectionVertical ? handleListAreaLayout : undefined}
+            >
+                <FlashList
+                    {...(isScrollDirectionVertical && props.pullDown ? { onRefresh: props.pullDown } : {})}
+                    {...(isScrollDirectionVertical ? { numColumns } : {})}
+                    ListFooterComponent={loadMoreButton}
+                    ListFooterComponentStyle={{
+                        ...props.style.loadMoreButtonContainer,
+                        ...(isScrollDirectionVertical ? { marginTop: 8 } : { marginStart: 8 })
+                    }}
+                    refreshing={props.pullDownIsExecuting}
+                    data={props.items}
+                    horizontal={!isScrollDirectionVertical}
+                    keyExtractor={item => item.id}
+                    ListEmptyComponent={renderEmptyPlaceholder}
+                    onEndReached={onEndReached}
+                    onEndReachedThreshold={0.6}
+                    scrollEventThrottle={50}
+                    renderItem={renderItem}
+                    style={listStyle}
+                    testID={`${name}-list`}
+                    onContentSizeChange={isScrollDirectionVertical ? (_w, h) => setContentHeight(h) : undefined}
+                />
+            </View>
         </View>
     );
 };
diff --git a/packages/pluggableWidgets/gallery-native/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap b/packages/pluggableWidgets/gallery-native/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap
index 8665fd92e..aa845444f 100644
--- a/packages/pluggableWidgets/gallery-native/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap
+++ b/packages/pluggableWidgets/gallery-native/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap
@@ -2,173 +2,198 @@
 
 exports[`Gallery rendering rendering with load more button it shouldn't render the paging button if hasn't more item 1`] = `
 <View
-  style={{}}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      {},
+    ]
+  }
   testID="gallery-test"
 >
   <View
-    ListFooterComponentStyle={
+    onLayout={[Function]}
+    style={
       {
-        "marginTop": 8,
+        "flex": 1,
       }
     }
-    horizontal={false}
-    keyExtractor={[Function]}
-    numColumns={2}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
   >
-    <View>
-      <View
-        testID="gallery-test-list-item-11"
-      >
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginTop": 8,
+        }
+      }
+      horizontal={false}
+      keyExtractor={[Function]}
+      numColumns={2}
+      onContentSizeChange={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      scrollEventThrottle={50}
+      style={
+        [
+          {
+            "flex": 1,
+          },
+          undefined,
+        ]
+      }
+      testID="gallery-test-list"
+    >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              undefined,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-11"
         >
-          11
+          <View
+            style={
+              [
+                undefined,
+                undefined,
+                false,
+              ]
+            }
+          >
+            11
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-22"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-22"
         >
-          22
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            22
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-33"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-33"
         >
-          33
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            33
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-44"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-44"
         >
-          44
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            44
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-55"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-55"
         >
-          55
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            55
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-66"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-66"
         >
-          66
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            66
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-77"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-77"
         >
-          77
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            77
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-88"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-88"
         >
-          88
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            88
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-99"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              undefined,
-            ]
-          }
+          testID="gallery-test-list-item-99"
         >
-          99
+          <View
+            style={
+              [
+                undefined,
+                false,
+                undefined,
+              ]
+            }
+          >
+            99
+          </View>
         </View>
       </View>
     </View>
@@ -178,220 +203,245 @@ exports[`Gallery rendering rendering with load more button it shouldn't render t
 
 exports[`Gallery rendering rendering with load more button renders correctly 1`] = `
 <View
-  style={{}}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      {},
+    ]
+  }
   testID="gallery-test"
 >
   <View
-    ListFooterComponentStyle={
+    onLayout={[Function]}
+    style={
       {
-        "marginTop": 8,
+        "flex": 1,
       }
     }
-    horizontal={false}
-    keyExtractor={[Function]}
-    numColumns={2}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
   >
-    <View>
-      <View
-        testID="gallery-test-list-item-11"
-      >
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginTop": 8,
+        }
+      }
+      horizontal={false}
+      keyExtractor={[Function]}
+      numColumns={2}
+      onContentSizeChange={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      scrollEventThrottle={50}
+      style={
+        [
+          {
+            "flex": 1,
+          },
+          undefined,
+        ]
+      }
+      testID="gallery-test-list"
+    >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              undefined,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-11"
         >
-          11
+          <View
+            style={
+              [
+                undefined,
+                undefined,
+                false,
+              ]
+            }
+          >
+            11
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-22"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-22"
         >
-          22
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            22
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-33"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-33"
         >
-          33
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            33
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-44"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-44"
         >
-          44
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            44
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-55"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-55"
         >
-          55
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            55
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-66"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-66"
         >
-          66
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            66
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-77"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-77"
         >
-          77
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            77
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-88"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-88"
         >
-          88
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            88
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-99"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              undefined,
-            ]
-          }
+          testID="gallery-test-list-item-99"
         >
-          99
+          <View
+            style={
+              [
+                undefined,
+                false,
+                undefined,
+              ]
+            }
+          >
+            99
+          </View>
         </View>
       </View>
-    </View>
-    <View
-      accessibilityState={
-        {
-          "busy": undefined,
-          "checked": undefined,
-          "disabled": undefined,
-          "expanded": undefined,
-          "selected": undefined,
+      <View
+        accessibilityState={
+          {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
         }
-      }
-      accessibilityValue={
-        {
-          "max": undefined,
-          "min": undefined,
-          "now": undefined,
-          "text": undefined,
+        accessibilityValue={
+          {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
         }
-      }
-      accessible={true}
-      collapsable={false}
-      focusable={true}
-      nativeBackgroundAndroid={
-        {
-          "borderless": false,
-          "color": 855638016,
-          "rippleRadius": undefined,
-          "type": "RippleAndroid",
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        nativeBackgroundAndroid={
+          {
+            "borderless": false,
+            "color": 855638016,
+            "rippleRadius": undefined,
+            "type": "RippleAndroid",
+          }
         }
-      }
-      onBlur={[Function]}
-      onClick={[Function]}
-      onFocus={[Function]}
-      onResponderGrant={[Function]}
-      onResponderMove={[Function]}
-      onResponderRelease={[Function]}
-      onResponderTerminate={[Function]}
-      onResponderTerminationRequest={[Function]}
-      onStartShouldSetResponder={[Function]}
-      style={{}}
-      testID="gallery-test-pagination-button"
-    >
-      <Text>
-        Load more
-      </Text>
+        onBlur={[Function]}
+        onClick={[Function]}
+        onFocus={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={{}}
+        testID="gallery-test-pagination-button"
+      >
+        <Text>
+          Load more
+        </Text>
+      </View>
     </View>
   </View>
 </View>
@@ -399,220 +449,245 @@ exports[`Gallery rendering rendering with load more button renders correctly 1`]
 
 exports[`Gallery rendering rendering with load more button renders correctly with custom paging button title 1`] = `
 <View
-  style={{}}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      {},
+    ]
+  }
   testID="gallery-test"
 >
   <View
-    ListFooterComponentStyle={
+    onLayout={[Function]}
+    style={
       {
-        "marginTop": 8,
+        "flex": 1,
       }
     }
-    horizontal={false}
-    keyExtractor={[Function]}
-    numColumns={2}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
   >
-    <View>
-      <View
-        testID="gallery-test-list-item-11"
-      >
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginTop": 8,
+        }
+      }
+      horizontal={false}
+      keyExtractor={[Function]}
+      numColumns={2}
+      onContentSizeChange={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      scrollEventThrottle={50}
+      style={
+        [
+          {
+            "flex": 1,
+          },
+          undefined,
+        ]
+      }
+      testID="gallery-test-list"
+    >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              undefined,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-11"
         >
-          11
+          <View
+            style={
+              [
+                undefined,
+                undefined,
+                false,
+              ]
+            }
+          >
+            11
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-22"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-22"
         >
-          22
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            22
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-33"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-33"
         >
-          33
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            33
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-44"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-44"
         >
-          44
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            44
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-55"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-55"
         >
-          55
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            55
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-66"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-66"
         >
-          66
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            66
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-77"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-77"
         >
-          77
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            77
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-88"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-88"
         >
-          88
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            88
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-99"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              undefined,
-            ]
-          }
+          testID="gallery-test-list-item-99"
         >
-          99
+          <View
+            style={
+              [
+                undefined,
+                false,
+                undefined,
+              ]
+            }
+          >
+            99
+          </View>
         </View>
       </View>
-    </View>
-    <View
-      accessibilityState={
-        {
-          "busy": undefined,
-          "checked": undefined,
-          "disabled": undefined,
-          "expanded": undefined,
-          "selected": undefined,
+      <View
+        accessibilityState={
+          {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
         }
-      }
-      accessibilityValue={
-        {
-          "max": undefined,
-          "min": undefined,
-          "now": undefined,
-          "text": undefined,
+        accessibilityValue={
+          {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
         }
-      }
-      accessible={true}
-      collapsable={false}
-      focusable={true}
-      nativeBackgroundAndroid={
-        {
-          "borderless": false,
-          "color": 855638016,
-          "rippleRadius": undefined,
-          "type": "RippleAndroid",
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        nativeBackgroundAndroid={
+          {
+            "borderless": false,
+            "color": 855638016,
+            "rippleRadius": undefined,
+            "type": "RippleAndroid",
+          }
         }
-      }
-      onBlur={[Function]}
-      onClick={[Function]}
-      onFocus={[Function]}
-      onResponderGrant={[Function]}
-      onResponderMove={[Function]}
-      onResponderRelease={[Function]}
-      onResponderTerminate={[Function]}
-      onResponderTerminationRequest={[Function]}
-      onStartShouldSetResponder={[Function]}
-      style={{}}
-      testID="gallery-test-pagination-button"
-    >
-      <Text>
-        Show more
-      </Text>
+        onBlur={[Function]}
+        onClick={[Function]}
+        onFocus={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={{}}
+        testID="gallery-test-pagination-button"
+      >
+        <Text>
+          Show more
+        </Text>
+      </View>
     </View>
   </View>
 </View>
@@ -620,173 +695,198 @@ exports[`Gallery rendering rendering with load more button renders correctly wit
 
 exports[`Gallery rendering renders correctly 1`] = `
 <View
-  style={{}}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      {},
+    ]
+  }
   testID="gallery-test"
 >
   <View
-    ListFooterComponentStyle={
+    onLayout={[Function]}
+    style={
       {
-        "marginTop": 8,
+        "flex": 1,
       }
     }
-    horizontal={false}
-    keyExtractor={[Function]}
-    numColumns={2}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
   >
-    <View>
-      <View
-        testID="gallery-test-list-item-11"
-      >
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginTop": 8,
+        }
+      }
+      horizontal={false}
+      keyExtractor={[Function]}
+      numColumns={2}
+      onContentSizeChange={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      scrollEventThrottle={50}
+      style={
+        [
+          {
+            "flex": 1,
+          },
+          undefined,
+        ]
+      }
+      testID="gallery-test-list"
+    >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              undefined,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-11"
         >
-          11
+          <View
+            style={
+              [
+                undefined,
+                undefined,
+                false,
+              ]
+            }
+          >
+            11
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-22"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-22"
         >
-          22
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            22
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-33"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-33"
         >
-          33
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            33
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-44"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-44"
         >
-          44
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            44
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-55"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-55"
         >
-          55
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            55
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-66"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-66"
         >
-          66
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            66
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-77"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-77"
         >
-          77
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            77
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-88"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-88"
         >
-          88
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            88
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-99"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              undefined,
-            ]
-          }
+          testID="gallery-test-list-item-99"
         >
-          99
+          <View
+            style={
+              [
+                undefined,
+                false,
+                undefined,
+              ]
+            }
+          >
+            99
+          </View>
         </View>
       </View>
     </View>
@@ -799,214 +899,216 @@ exports[`Gallery rendering renders correctly horizontal 1`] = `
   style={{}}
   testID="gallery-test"
 >
-  <View
-    ListFooterComponentStyle={
-      {
-        "marginStart": 8,
-      }
-    }
-    horizontal={true}
-    keyExtractor={[Function]}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
-  >
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
+  <View>
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginStart": 8,
         }
-        testID="gallery-test-list-item-11"
-      >
+      }
+      horizontal={true}
+      keyExtractor={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      scrollEventThrottle={50}
+      testID="gallery-test-list"
+    >
+      <View>
         <View
           style={
-            [
-              undefined,
-              undefined,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-11"
         >
-          11
+          <View
+            style={
+              [
+                undefined,
+                undefined,
+                false,
+              ]
+            }
+          >
+            11
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-22"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-22"
         >
-          22
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            22
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-33"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-33"
         >
-          33
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            33
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-44"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-44"
         >
-          44
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            44
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-55"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-55"
         >
-          55
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            55
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-66"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-66"
         >
-          66
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            66
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-77"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-77"
         >
-          77
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            77
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-88"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              false,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-88"
         >
-          88
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            88
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        style={
-          {
-            "width": 750,
-          }
-        }
-        testID="gallery-test-list-item-99"
-      >
+      <View>
         <View
           style={
-            [
-              undefined,
-              false,
-              undefined,
-            ]
+            {
+              "width": 750,
+            }
           }
+          testID="gallery-test-list-item-99"
         >
-          99
+          <View
+            style={
+              [
+                undefined,
+                false,
+                undefined,
+              ]
+            }
+          >
+            99
+          </View>
         </View>
       </View>
     </View>
@@ -1016,28 +1118,53 @@ exports[`Gallery rendering renders correctly horizontal 1`] = `
 
 exports[`Gallery rendering renders correctly with empty list and custom placeholder 1`] = `
 <View
-  style={{}}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      {},
+    ]
+  }
   testID="gallery-test"
 >
   <View
-    ListFooterComponentStyle={
+    onLayout={[Function]}
+    style={
       {
-        "marginTop": 8,
+        "flex": 1,
       }
     }
-    horizontal={false}
-    keyExtractor={[Function]}
-    numColumns={2}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    refreshing={false}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
   >
-    <View>
-      <Text>
-        Empty list...
-      </Text>
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginTop": 8,
+        }
+      }
+      horizontal={false}
+      keyExtractor={[Function]}
+      numColumns={2}
+      onContentSizeChange={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      refreshing={false}
+      scrollEventThrottle={50}
+      style={
+        [
+          {
+            "flex": 1,
+          },
+          undefined,
+        ]
+      }
+      testID="gallery-test-list"
+    >
+      <View>
+        <Text>
+          Empty list...
+        </Text>
+      </View>
     </View>
   </View>
 </View>
@@ -1045,176 +1172,201 @@ exports[`Gallery rendering renders correctly with empty list and custom placehol
 
 exports[`Gallery rendering renders correctly with filter 1`] = `
 <View
-  style={{}}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      {},
+    ]
+  }
   testID="gallery-test"
 >
   <View>
     <TextInput />
   </View>
   <View
-    ListFooterComponentStyle={
+    onLayout={[Function]}
+    style={
       {
-        "marginTop": 8,
+        "flex": 1,
       }
     }
-    horizontal={false}
-    keyExtractor={[Function]}
-    numColumns={2}
-    onEndReached={[Function]}
-    onEndReachedThreshold={0.6}
-    scrollEventThrottle={50}
-    testID="gallery-test-list"
   >
-    <View>
-      <View
-        testID="gallery-test-list-item-11"
-      >
+    <View
+      ListFooterComponentStyle={
+        {
+          "marginTop": 8,
+        }
+      }
+      horizontal={false}
+      keyExtractor={[Function]}
+      numColumns={2}
+      onContentSizeChange={[Function]}
+      onEndReached={[Function]}
+      onEndReachedThreshold={0.6}
+      scrollEventThrottle={50}
+      style={
+        [
+          {
+            "flex": 1,
+          },
+          undefined,
+        ]
+      }
+      testID="gallery-test-list"
+    >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              undefined,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-11"
         >
-          11
+          <View
+            style={
+              [
+                undefined,
+                undefined,
+                false,
+              ]
+            }
+          >
+            11
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-22"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-22"
         >
-          22
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            22
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-33"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-33"
         >
-          33
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            33
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-44"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-44"
         >
-          44
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            44
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-55"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-55"
         >
-          55
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            55
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-66"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-66"
         >
-          66
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            66
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-77"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-77"
         >
-          77
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            77
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-88"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              false,
-            ]
-          }
+          testID="gallery-test-list-item-88"
         >
-          88
+          <View
+            style={
+              [
+                undefined,
+                false,
+                false,
+              ]
+            }
+          >
+            88
+          </View>
         </View>
       </View>
-    </View>
-    <View>
-      <View
-        testID="gallery-test-list-item-99"
-      >
+      <View>
         <View
-          style={
-            [
-              undefined,
-              false,
-              undefined,
-            ]
-          }
+          testID="gallery-test-list-item-99"
         >
-          99
+          <View
+            style={
+              [
+                undefined,
+                false,
+                undefined,
+              ]
+            }
+          >
+            99
+          </View>
         </View>
       </View>
     </View>
diff --git a/packages/pluggableWidgets/gallery-native/src/package.xml b/packages/pluggableWidgets/gallery-native/src/package.xml
index 131f3fb0a..cc5b9921c 100644
--- a/packages/pluggableWidgets/gallery-native/src/package.xml
+++ b/packages/pluggableWidgets/gallery-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Gallery" version="2.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Gallery" version="2.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Gallery.xml" />
         </widgetFiles>