diff --git a/UNRELEASED.md b/UNRELEASED.md
index 379b0c3e6fa..e49472d1ba3 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -14,6 +14,8 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 
 ### Bug fixes
 
+- Fixed issue with `Stack` where a `Stack.Item` was not getting a minimum width ([2273](https://github.com/Shopify/polaris-react/pull/2273))
+
 ### Documentation
 
 - Added accessibility documentation for the drop zone component ([#2243](https://github.com/Shopify/polaris-react/pull/2243))
diff --git a/src/components/Stack/Stack.scss b/src/components/Stack/Stack.scss
index 4142572bed2..b3da80d71f5 100644
--- a/src/components/Stack/Stack.scss
+++ b/src/components/Stack/Stack.scss
@@ -105,6 +105,7 @@
 
 .Item {
   flex: 0 1 auto;
+  min-width: 0;
 }
 
 .Item-fill {
diff --git a/src/components/TextField/README.md b/src/components/TextField/README.md
index 87021693337..658a93dd10c 100644
--- a/src/components/TextField/README.md
+++ b/src/components/TextField/README.md
@@ -680,32 +680,34 @@ function SeparateValidationErrorExample() {
     : '';
 
   const formGroupMarkup = (
-    <Stack wrap={false} alignment="leading" spacing="tight">
+    <Stack wrap={false} alignment="leading" spacing="loose">
       <Stack.Item fill>
-        <Stack distribution="fill" spacing="tight">
-          <Select
-            labelHidden
-            label="Collection rule type"
-            options={['Product type']}
-            value={selectTypeValue}
-            onChange={handleSelectTypeChange}
-          />
-          <Select
-            labelHidden
-            label="Collection rule condition"
-            options={['is equal to']}
-            value={selectConditionValue}
-            onChange={handleSelectConditionChange}
-          />
-          <TextField
-            labelHidden
-            label="Collection rule content"
-            error={isInvalid}
-            id={textFieldID}
-            value={textFieldValue}
-            onChange={handleTextFieldValueChange}
-          />
-        </Stack>
+        <FormLayout>
+          <FormLayout.Group condensed>
+            <Select
+              labelHidden
+              label="Collection rule type"
+              options={['Product type']}
+              value={selectTypeValue}
+              onChange={handleSelectTypeChange}
+            />
+            <Select
+              labelHidden
+              label="Collection rule condition"
+              options={['is equal to']}
+              value={selectConditionValue}
+              onChange={handleSelectConditionChange}
+            />
+            <TextField
+              labelHidden
+              label="Collection rule content"
+              error={isInvalid}
+              id={textFieldID}
+              value={textFieldValue}
+              onChange={handleTextFieldValueChange}
+            />
+          </FormLayout.Group>
+        </FormLayout>
         <div style={{marginTop: '4px'}}>
           <InlineError message={errorMessage} fieldID={textFieldID} />
         </div>