diff --git a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
index 50e7d30d..f61ffa9d 100644
--- a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
+++ b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
@@ -14,7 +14,7 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `
   scrollingDisabled={false}
   title="AuthenticationPage.schemaTitleLogin"
 >
-  <Connect(withRouter(TopbarContainerComponent))
+  <withRouter(Connect(TopbarContainerComponent))
     className=""
   />
   <div>
diff --git a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
index e08d77cd..f21ed36d 100644
--- a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
+++ b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
@@ -16,7 +16,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
       className={null}
       rootClassName={null}
     >
-      <Connect(withRouter(TopbarContainerComponent))
+      <withRouter(Connect(TopbarContainerComponent))
         currentPage="ContactDetailsPage"
       />
       <UserNav
diff --git a/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap b/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap
index 3cc12122..572f50bc 100644
--- a/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap
+++ b/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap
@@ -7,7 +7,7 @@ exports[`EditListingPageComponent matches snapshot 1`] = `
   scrollingDisabled={false}
   title="EditListingPage.titleCreateListing"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <InjectIntl(EditListingWizard)
     currentUser={null}
     errors={
diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
index 92256314..b724d8e9 100644
--- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
+++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
@@ -7,7 +7,7 @@ exports[`InboxPage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="InboxPage.ordersTitle"
 >
-  <Connect(withRouter(TopbarContainerComponent))
+  <withRouter(Connect(TopbarContainerComponent))
     currentPage="InboxPage"
   />
   <div>
@@ -338,7 +338,7 @@ exports[`InboxPage matches snapshot 3`] = `
   scrollingDisabled={false}
   title="InboxPage.salesTitle"
 >
-  <Connect(withRouter(TopbarContainerComponent))
+  <withRouter(Connect(TopbarContainerComponent))
     currentPage="InboxPage"
   />
   <div>
diff --git a/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap b/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
index 1fc3a4ba..734383b0 100644
--- a/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
+++ b/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
@@ -38,7 +38,7 @@ exports[`LandingPage matches snapshot 1`] = `
     ]
   }
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <div>
     <HeroSection
       className={null}
diff --git a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
index 8d0d0ccd..90393f34 100644
--- a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
+++ b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
@@ -22,7 +22,7 @@ exports[`ListingPage matches snapshot 1`] = `
   title="ListingPage.schemaTitle"
   twitterImages={Array []}
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <div
     className=""
   >
diff --git a/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap b/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
index 02560702..02c07f96 100644
--- a/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
+++ b/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
@@ -7,7 +7,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="Manage listings"
 >
-  <Connect(withRouter(TopbarContainerComponent))
+  <withRouter(Connect(TopbarContainerComponent))
     currentPage="ManageListingsPage"
   />
   <UserNav
diff --git a/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap b/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
index 8e3baadd..2e24d661 100644
--- a/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
+++ b/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
@@ -7,7 +7,7 @@ exports[`NotFoundPageComponent matches snapshot 1`] = `
   scrollingDisabled={false}
   title="NotFoundPage.title"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <div>
     <div>
       <div>
diff --git a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
index 9ce0bd0b..bc25b2bd 100644
--- a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
+++ b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
@@ -7,7 +7,7 @@ exports[`OrderPage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="OrderPage.title"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <InjectIntl(Component)
     className="undefined"
     transaction={
diff --git a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
index f42dd7ae..c6efb7b0 100644
--- a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
+++ b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
@@ -16,7 +16,7 @@ exports[`PasswordChangePage matches snapshot 1`] = `
       className={null}
       rootClassName={null}
     >
-      <Connect(withRouter(TopbarContainerComponent))
+      <withRouter(Connect(TopbarContainerComponent))
         currentPage="PasswordChangePage"
       />
       <UserNav
diff --git a/src/containers/PasswordRecoveryPage/__snapshots__/PasswordRecoveryPage.test.js.snap b/src/containers/PasswordRecoveryPage/__snapshots__/PasswordRecoveryPage.test.js.snap
index 2f2519ea..e875bc0e 100644
--- a/src/containers/PasswordRecoveryPage/__snapshots__/PasswordRecoveryPage.test.js.snap
+++ b/src/containers/PasswordRecoveryPage/__snapshots__/PasswordRecoveryPage.test.js.snap
@@ -6,7 +6,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
   logoutError={null}
   title="PasswordRecoveryPage.title"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <div>
     <div>
       <IconKeys
diff --git a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
index dee1d830..f6150594 100644
--- a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
+++ b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
@@ -7,6 +7,6 @@ exports[`PayoutPreferencesPage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="Payout preferences"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
 </Page>
 `;
diff --git a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
index 9bc6405b..6636aea6 100644
--- a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
+++ b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
@@ -7,6 +7,6 @@ exports[`ProfilePage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="Profile page with display name: most-awesome-shop"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
 </Page>
 `;
diff --git a/src/containers/ProfileSettingsPage/__snapshots__/ProfileSettingsPage.test.js.snap b/src/containers/ProfileSettingsPage/__snapshots__/ProfileSettingsPage.test.js.snap
index 13ac7189..b2dd269e 100644
--- a/src/containers/ProfileSettingsPage/__snapshots__/ProfileSettingsPage.test.js.snap
+++ b/src/containers/ProfileSettingsPage/__snapshots__/ProfileSettingsPage.test.js.snap
@@ -7,7 +7,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="Profile settings"
 >
-  <Connect(withRouter(TopbarContainerComponent))
+  <withRouter(Connect(TopbarContainerComponent))
     currentPage="ProfileSettingsPage"
   />
   <UserNav
diff --git a/src/containers/SalePage/__snapshots__/SalePage.test.js.snap b/src/containers/SalePage/__snapshots__/SalePage.test.js.snap
index 67ea3f27..9fea1e3a 100644
--- a/src/containers/SalePage/__snapshots__/SalePage.test.js.snap
+++ b/src/containers/SalePage/__snapshots__/SalePage.test.js.snap
@@ -7,7 +7,7 @@ exports[`SalePage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="SalePage.title"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <div>
     <InjectIntl(Component)
       acceptInProgress={false}
diff --git a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
index 9880bfda..5d94ec4a 100644
--- a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
+++ b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
@@ -17,7 +17,7 @@ exports[`SearchPageComponent matches snapshot 1`] = `
   scrollingDisabled={false}
   title="SearchPage.schemaTitle"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
   <div>
     <div>
       <div>
diff --git a/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap b/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
index 3610b64b..0577000c 100644
--- a/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
+++ b/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
@@ -7,6 +7,6 @@ exports[`SecurityPage matches snapshot 1`] = `
   scrollingDisabled={false}
   title="Security"
 >
-  <Connect(withRouter(TopbarContainerComponent)) />
+  <withRouter(Connect(TopbarContainerComponent)) />
 </Page>
 `;