diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6209b8e284..cabb938648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,12 +16,17 @@
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
 ### BREAKING CHANGES
 - Rename `context` prop to `mountNode` in `PortalInner` @layershifter ([#1288](https://github.com/stardust-ui/react/pull/1288))
 - Updated Teams' theme color palette values, removed color related site variables @mnajdova ([#1069](https://github.com/stardust-ui/react/pull/1069))
 - Remove `defaultTarget` prop in `Popup` component @layershifter ([#1153](https://github.com/stardust-ui/react/pull/1153))
 - Add focus border styling mechanism @Bugaa92 in Teams theme ([#1269](https://github.com/stardust-ui/react/pull/1269))
 
+### Fixes
+- Fix double rendering of `Popup` component @layershifter ([#1153](https://github.com/stardust-ui/react/pull/1153))
+- Docs: fix(docs): Set maximum width for examples @miroslavstastny ([#1319](https://github.com/stardust-ui/react/pull/1319))
+
 ### Features
 - Add default child a11y behavior to `Menu` related behaviors @silviuavram ([#1282](https://github.com/stardust-ui/react/pull/1282))
 - `Ref` component extracted to a `@stardust-ui/react-component-ref` @layershifter ([#1281](https://github.com/stardust-ui/react/pull/1281))
@@ -32,9 +37,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Added default and brand color schemes in Teams' theme @mnajdova ([#1069](https://github.com/stardust-ui/react/pull/1069))
 - Export `files-upload` SVG icon for `Teams` theme @manindr ([#1293](https://github.com/stardust-ui/react/pull/1293))
 
-### Fixes
-- Fix double rendering of `Popup` component @layershifter ([#1153](https://github.com/stardust-ui/react/pull/1153))
-
 <!--------------------------------[ v0.29.1 ]------------------------------- -->
 ## [v0.29.1](https://github.com/stardust-ui/react/tree/v0.29.1) (2019-05-01)
 [Compare changes](https://github.com/stardust-ui/react/compare/v0.29.0...v0.29.1)
diff --git a/docs/src/components/ComponentDoc/ExampleSection.tsx b/docs/src/components/ComponentDoc/ExampleSection.tsx
index 73fbbf7dc8..a6536ba11c 100644
--- a/docs/src/components/ComponentDoc/ExampleSection.tsx
+++ b/docs/src/components/ComponentDoc/ExampleSection.tsx
@@ -14,12 +14,13 @@ export type ExampleSectionProps = Extendable<{
   title: string
 }>
 
+// minmax = prevent example overflow - https://stackoverflow.com/a/43312314
 const ExampleSection: React.FC<ExampleSectionProps> = ({ title, children }) => (
   <>
     <Header as="h2" styles={headerStyle} className="no-anchor">
       {title}
     </Header>
-    <Grid variables={{ gridGap: '2rem' }} columns="1">
+    <Grid variables={{ gridGap: '2rem' }} columns="minmax(550px, 1fr)">
       {children}
     </Grid>
   </>
diff --git a/docs/src/examples/components/Text/States/TextExampleTruncated.shorthand.tsx b/docs/src/examples/components/Text/States/TextExampleTruncated.shorthand.tsx
index 9a64227b49..001a6076a3 100644
--- a/docs/src/examples/components/Text/States/TextExampleTruncated.shorthand.tsx
+++ b/docs/src/examples/components/Text/States/TextExampleTruncated.shorthand.tsx
@@ -11,7 +11,7 @@ const [notTruncatedText, truncatedText] = [
 )
 
 const TextExampleTruncatedShorthand = () => (
-  <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', width: 500 }}>
+  <div style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}>
     <Text content={notTruncatedText} />
     <br />
     <br />
diff --git a/docs/src/examples/components/Text/States/TextExampleTruncated.tsx b/docs/src/examples/components/Text/States/TextExampleTruncated.tsx
index b29f6a3f72..dc4898742a 100644
--- a/docs/src/examples/components/Text/States/TextExampleTruncated.tsx
+++ b/docs/src/examples/components/Text/States/TextExampleTruncated.tsx
@@ -11,7 +11,7 @@ const [notTruncatedText, truncatedText] = [
 )
 
 const TextExampleTruncated = () => (
-  <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', width: 500 }}>
+  <div style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}>
     <Text>{notTruncatedText}</Text>
     <br />
     <br />