diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index 34a2ebe2f..e0f9d7b51 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -316,7 +316,7 @@
   },
   "productVariantWarehouseSectionDescription": {
     "context": "no warehouses info",
-    "string": "There are no warehouses set up for your store. To add stock quantity to the variant please"
+    "string": "There are no warehouses set up for your store. To add stock quantity to the variant please {configureWarehouseUrl}"
   },
   "productVariantWarehouseSectionDescriptionLink": {
     "context": "no warehouses info",
@@ -324,7 +324,7 @@
   },
   "productWarehouseSectionDescription": {
     "context": "no warehouses info",
-    "string": "There are no warehouses set up for your store. To add stock quantity to the product please"
+    "string": "There are no warehouses set up for your store. To add stock quantity to the product please {configureWarehouseUrl}"
   },
   "productWarehouseSectionDescriptionLink": {
     "context": "no warehouses info",
diff --git a/src/products/components/ProductStocks/ProductStocks.tsx b/src/products/components/ProductStocks/ProductStocks.tsx
index cab8dfe8f..81ed77dc1 100644
--- a/src/products/components/ProductStocks/ProductStocks.tsx
+++ b/src/products/components/ProductStocks/ProductStocks.tsx
@@ -191,32 +191,40 @@ const ProductStocks: React.FC<ProductStocksProps> = ({
             {hasVariants ? (
               <>
                 <FormattedMessage
-                  defaultMessage="There are no warehouses set up for your store. To add stock quantity to the variant please"
+                  defaultMessage="There are no warehouses set up for your store. To add stock quantity to the variant please {configureWarehouseUrl}"
                   description="no warehouses info"
                   id="productVariantWarehouseSectionDescription"
-                />{" "}
-                <Link onClick={onWarehouseConfigure}>
-                  <FormattedMessage
-                    defaultMessage="configure a warehouse"
-                    description="no warehouses info"
-                    id="productVariantWarehouseSectionDescriptionLink"
-                  />
-                </Link>
+                  values={{
+                    configureWarehouseUrl: (
+                      <Link onClick={onWarehouseConfigure}>
+                        <FormattedMessage
+                          defaultMessage="configure a warehouse"
+                          description="no warehouses info"
+                          id="productVariantWarehouseSectionDescriptionLink"
+                        />
+                      </Link>
+                    )
+                  }}
+                />
               </>
             ) : (
               <>
                 <FormattedMessage
-                  defaultMessage="There are no warehouses set up for your store. To add stock quantity to the product please"
+                  defaultMessage="There are no warehouses set up for your store. To add stock quantity to the product please {configureWarehouseUrl}"
                   description="no warehouses info"
                   id="productWarehouseSectionDescription"
-                />{" "}
-                <Link onClick={onWarehouseConfigure}>
-                  <FormattedMessage
-                    defaultMessage="configure a warehouse"
-                    description="no warehouses info"
-                    id="productWarehouseSectionDescriptionLink"
-                  />
-                </Link>
+                  values={{
+                    configureWarehouseUrl: (
+                      <Link onClick={onWarehouseConfigure}>
+                        <FormattedMessage
+                          defaultMessage="configure a warehouse"
+                          description="no warehouses info"
+                          id="productWarehouseSectionDescriptionLink"
+                        />
+                      </Link>
+                    )
+                  }}
+                />
               </>
             )}
           </Typography>
diff --git a/src/products/views/ProductCreate.tsx b/src/products/views/ProductCreate.tsx
index 168b21bc3..b5df23fcd 100644
--- a/src/products/views/ProductCreate.tsx
+++ b/src/products/views/ProductCreate.tsx
@@ -14,7 +14,7 @@ import {
   usePrivateMetadataUpdate
 } from "@saleor/utils/metadata/updateMetadata";
 import { useWarehouseList } from "@saleor/warehouses/queries";
-import { warehouseListPath } from "@saleor/warehouses/urls";
+import { warehouseAddPath } from "@saleor/warehouses/urls";
 import React from "react";
 import { useIntl } from "react-intl";
 
@@ -181,7 +181,7 @@ export const ProductCreateView: React.FC = () => {
         )}
         onBack={handleBack}
         onSubmit={handleSubmit}
-        onWarehouseConfigure={() => navigate(warehouseListPath)}
+        onWarehouseConfigure={() => navigate(warehouseAddPath)}
         saveButtonBarState={productCreateOpts.status}
         fetchMoreCategories={{
           hasMore: searchCategoryOpts.data?.search.pageInfo.hasNextPage,
diff --git a/src/products/views/ProductUpdate/ProductUpdate.tsx b/src/products/views/ProductUpdate/ProductUpdate.tsx
index ae12fe679..294db7989 100644
--- a/src/products/views/ProductUpdate/ProductUpdate.tsx
+++ b/src/products/views/ProductUpdate/ProductUpdate.tsx
@@ -33,7 +33,7 @@ import {
   usePrivateMetadataUpdate
 } from "@saleor/utils/metadata/updateMetadata";
 import { useWarehouseList } from "@saleor/warehouses/queries";
-import { warehouseListPath } from "@saleor/warehouses/urls";
+import { warehouseAddPath } from "@saleor/warehouses/urls";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -305,7 +305,7 @@ export const ProductUpdate: React.FC<ProductUpdateProps> = ({ id, params }) => {
         onDelete={() => openModal("remove")}
         onImageReorder={handleImageReorder}
         onSubmit={handleSubmit}
-        onWarehouseConfigure={() => navigate(warehouseListPath)}
+        onWarehouseConfigure={() => navigate(warehouseAddPath)}
         onVariantAdd={handleVariantAdd}
         onVariantsAdd={() => navigate(productVariantCreatorUrl(id))}
         onVariantShow={variantId => () =>
diff --git a/src/products/views/ProductVariant.tsx b/src/products/views/ProductVariant.tsx
index acbc500c5..e2325f729 100644
--- a/src/products/views/ProductVariant.tsx
+++ b/src/products/views/ProductVariant.tsx
@@ -13,7 +13,7 @@ import {
   usePrivateMetadataUpdate
 } from "@saleor/utils/metadata/updateMetadata";
 import { useWarehouseList } from "@saleor/warehouses/queries";
-import { warehouseListPath } from "@saleor/warehouses/urls";
+import { warehouseAddPath } from "@saleor/warehouses/urls";
 import React, { useEffect, useState } from "react";
 import { useIntl } from "react-intl";
 
@@ -217,7 +217,7 @@ export const ProductVariant: React.FC<ProductUpdateProps> = ({
         onDelete={() => openModal("remove")}
         onImageSelect={handleImageSelect}
         onSubmit={handleSubmit}
-        onWarehouseConfigure={() => navigate(warehouseListPath)}
+        onWarehouseConfigure={() => navigate(warehouseAddPath)}
         onVariantClick={variantId => {
           navigate(productVariantEditUrl(productId, variantId));
         }}
diff --git a/src/products/views/ProductVariantCreate.tsx b/src/products/views/ProductVariantCreate.tsx
index 06c9faa3a..80516e2b2 100644
--- a/src/products/views/ProductVariantCreate.tsx
+++ b/src/products/views/ProductVariantCreate.tsx
@@ -10,7 +10,7 @@ import {
   usePrivateMetadataUpdate
 } from "@saleor/utils/metadata/updateMetadata";
 import { useWarehouseList } from "@saleor/warehouses/queries";
-import { warehouseListPath } from "@saleor/warehouses/urls";
+import { warehouseAddPath } from "@saleor/warehouses/urls";
 import React from "react";
 import { useIntl } from "react-intl";
 
@@ -143,7 +143,7 @@ export const ProductVariant: React.FC<ProductVariantCreateProps> = ({
         onBack={handleBack}
         onSubmit={handleSubmit}
         onVariantClick={handleVariantClick}
-        onWarehouseConfigure={() => navigate(warehouseListPath)}
+        onWarehouseConfigure={() => navigate(warehouseAddPath)}
         onVariantReorder={handleVariantReorder}
         saveButtonBarState={variantCreateResult.status}
         warehouses={