diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82e2bea2a..6315fb66e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Fix isPublished and isAvailable behaviour for products, collections and pages - #780 by @mmarkusik
 - Add metadata editor to page views - #782 by @dominik-zeglen
 - Add missing infinite scroll to searches - #793 by @dominik-zeglen
+- Fix for fulfilling order when allocated quantity equals total quantity - #788 by @GrzegorzDerdak
 
 ## 2.10.1
 
diff --git a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx
index e8e157f5b..eb882f046 100644
--- a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx
+++ b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx
@@ -257,7 +257,7 @@ const OrderFulfillPage: React.FC<OrderFulfillPageProps> = props => {
                 <TableBody>
                   {renderCollection(
                     order?.lines.filter(line => getRemainingQuantity(line) > 0),
-                    (line, lineIndex) => {
+                    (line: OrderFulfillData_order_lines, lineIndex) => {
                       if (!line) {
                         return (
                           <TableRow key={lineIndex}>
@@ -340,9 +340,16 @@ const OrderFulfillPage: React.FC<OrderFulfillPageProps> = props => {
                               );
                             }
 
+                            const warehouseAllocation = line.allocations.find(
+                              allocation =>
+                                allocation.warehouse.id === warehouse.id
+                            );
+                            const allocatedQuantityForLine =
+                              warehouseAllocation?.quantity || 0;
                             const availableQuantity =
                               warehouseStock.quantity -
-                              warehouseStock.quantityAllocated;
+                              warehouseStock.quantityAllocated +
+                              allocatedQuantityForLine;
 
                             return (
                               <TableCell
@@ -361,7 +368,7 @@ const OrderFulfillPage: React.FC<OrderFulfillPageProps> = props => {
                                     ),
                                     max: (
                                       line.variant.trackInventory &&
-                                      warehouseStock.quantity
+                                      availableQuantity
                                     ).toString(),
                                     min: 0,
                                     style: { textAlign: "right" }
@@ -411,6 +418,7 @@ const OrderFulfillPage: React.FC<OrderFulfillPageProps> = props => {
                               </TableCell>
                             );
                           })}
+
                           <TableCell
                             className={classes.colQuantityTotal}
                             key="total"
diff --git a/src/orders/components/OrderFulfillPage/fixtures.ts b/src/orders/components/OrderFulfillPage/fixtures.ts
index cdeae6a24..5ecae5147 100644
--- a/src/orders/components/OrderFulfillPage/fixtures.ts
+++ b/src/orders/components/OrderFulfillPage/fixtures.ts
@@ -15,6 +15,7 @@ export const orderToFulfill: OrderFulfillData_order = {
       productName: "T-Shirt",
       quantity: 3,
       quantityFulfilled: 1,
+      allocations: [],
       variant: {
         __typename: "ProductVariant",
         id: "UHJvZHVjdFZhcmlhbnQ6Mjk2",
@@ -76,6 +77,7 @@ export const orderToFulfill: OrderFulfillData_order = {
       productName: "Lemon Juice",
       quantity: 4,
       quantityFulfilled: 0,
+      allocations: [],
       variant: {
         __typename: "ProductVariant",
         id: "UHJvZHVjdFZhcmlhbnQ6MTgx",
@@ -130,6 +132,7 @@ export const orderToFulfill: OrderFulfillData_order = {
       productName: "Orange Juice",
       quantity: 3,
       quantityFulfilled: 2,
+      allocations: [],
       variant: {
         __typename: "ProductVariant",
         id: "UHJvZHVjdFZhcmlhbnQ6MTgy",
diff --git a/src/orders/queries.ts b/src/orders/queries.ts
index 334c15538..45747bd88 100644
--- a/src/orders/queries.ts
+++ b/src/orders/queries.ts
@@ -195,6 +195,12 @@ const orderFulfillData = gql`
         isShippingRequired
         productName
         quantity
+        allocations {
+          quantity
+          warehouse {
+            id
+          }
+        }
         quantityFulfilled
         variant {
           id
diff --git a/src/orders/types/OrderFulfillData.ts b/src/orders/types/OrderFulfillData.ts
index 047fc94c0..1e344b827 100644
--- a/src/orders/types/OrderFulfillData.ts
+++ b/src/orders/types/OrderFulfillData.ts
@@ -52,6 +52,7 @@ export interface OrderFulfillData_order_lines {
   productName: string;
   quantity: number;
   quantityFulfilled: number;
+  allocations: OrderFulfillData_order_allocation[];
   variant: OrderFulfillData_order_lines_variant | null;
   thumbnail: OrderFulfillData_order_lines_thumbnail | null;
 }
@@ -70,3 +71,15 @@ export interface OrderFulfillData {
 export interface OrderFulfillDataVariables {
   orderId: string;
 }
+
+export interface OrderFulfillData_order_allocation {
+  __typename: "Allocation";
+  id: string;
+  quantity: number;
+  warehouse: OrderFulfillData_order_allocation_warehouse;
+}
+
+export interface OrderFulfillData_order_allocation_warehouse {
+  __typename: "Warehouse";
+  id: string;
+}
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 93afeac2c..de4af41f4 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -85609,7 +85609,7 @@ exports[`Storyshots Views / Orders / Fulfill order default 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="760"
+                        max="758"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -85649,7 +85649,7 @@ exports[`Storyshots Views / Orders / Fulfill order default 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="760"
+                        max="727"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -85689,7 +85689,7 @@ exports[`Storyshots Views / Orders / Fulfill order default 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="760"
+                        max="756"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -85819,7 +85819,7 @@ exports[`Storyshots Views / Orders / Fulfill order default 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="587"
+                        max="586"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -86262,7 +86262,7 @@ exports[`Storyshots Views / Orders / Fulfill order error 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="760"
+                        max="758"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -86302,7 +86302,7 @@ exports[`Storyshots Views / Orders / Fulfill order error 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="760"
+                        max="727"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -86342,7 +86342,7 @@ exports[`Storyshots Views / Orders / Fulfill order error 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="760"
+                        max="756"
                         min="0"
                         style="text-align:right"
                         type="number"
@@ -86472,7 +86472,7 @@ exports[`Storyshots Views / Orders / Fulfill order error 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id OrderFulfillPage-quantityInnerInput-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                        max="587"
+                        max="586"
                         min="0"
                         style="text-align:right"
                         type="number"