diff --git a/UNRELEASED.md b/UNRELEASED.md
index b4ba7052a6b..09ae4b6c41f 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -17,6 +17,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 - Added `action` prop to `Toast` ([#919](https://github.com/Shopify/polaris-react/pull/919))
 - Remove all usage of `@shopify/javascript-utilities/decorators`, namely `autobind`, `debounce`, and `memoize` ([#1148](https://github.com/Shopify/polaris-react/issues/1148))
 - Added `Empty State` footerContent prop ([#1200](https://github.com/Shopify/polaris-react/pull/1200))
+- Changed `TopBar`'s `contextControl`'s `max-width` to `width` ([#1206](https://github.com/Shopify/polaris-react/pull/1206))
 
 ### Bug fixes
 
diff --git a/src/components/TopBar/TopBar.scss b/src/components/TopBar/TopBar.scss
index c41a98f000d..995719133f6 100644
--- a/src/components/TopBar/TopBar.scss
+++ b/src/components/TopBar/TopBar.scss
@@ -33,7 +33,7 @@ $page-left-alignment-breakpoint-max: 1268px;
 .ContextControl {
   display: none;
   @include breakpoint-after(nav-min-window-corrected()) {
-    max-width: layout-width(nav);
+    width: layout-width(nav);
     display: block;
   }
 }