diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69e34895..e2e611d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ way to update this template, but currently, we follow a pattern:
 
 ## Upcoming version 2019-XX-XX
 
+- [fix] On `ListingPage` align avatar with the left side of the content and fix content width so
+  that it aligns with the header image.
+  [#1155](https://github.com/sharetribe/flex-template-web/pull/1155)
 - [fix] Rehydrate bug: existing DOM elements were populated incorrectly
   [#1154](https://github.com/sharetribe/flex-template-web/pull/1154)
 - [fix] Don't send personal id number or business profile to Stripe API when creating a Stripe
diff --git a/src/containers/ListingPage/ListingPage.css b/src/containers/ListingPage/ListingPage.css
index a5f9550d..1a273e53 100644
--- a/src/containers/ListingPage/ListingPage.css
+++ b/src/containers/ListingPage/ListingPage.css
@@ -224,7 +224,8 @@
     margin-top: 50px;
     margin-bottom: 0px;
     /* contentContainer's full width - (bookingColumn + two paddings + margin + border) */
-    flex-basis: calc(100% - 493px);
+    max-width: calc(100% - 433px);
+    flex-basis: calc(100% - 433px);
     flex-shrink: 0;
     flex-grow: 1;
   }
@@ -260,7 +261,6 @@
 
   @media (--viewportMedium) {
     position: absolute;
-    left: 60px;
     top: -49px;
     margin-left: 0;
     margin-top: 0;