diff --git a/src/page-objects/storefront/Home.ts b/src/page-objects/storefront/Home.ts
index d7949d4..f4538aa 100644
--- a/src/page-objects/storefront/Home.ts
+++ b/src/page-objects/storefront/Home.ts
@@ -107,6 +107,7 @@ export class Home implements PageObject {
         });
         const wishlistNotAddedIcon = listingItem.locator('.product-wishlist-not-added');
         const wishlistAddedIcon = listingItem.locator('.product-wishlist-added');
+        const removeProductFromWishlist = listingItem.locator('.icon-wishlist-remove');  
 
         return {
             productImage: productImage,
@@ -120,6 +121,7 @@ export class Home implements PageObject {
             productAddToShoppingCart: productAddToShoppingCart,
             wishlistNotAddedIcon: wishlistNotAddedIcon,
             wishlistAddedIcon: wishlistAddedIcon,
+            removeFromWishlistXButton: removeProductFromWishlist,
         };
     }
 
diff --git a/src/page-objects/storefront/Wishlist.ts b/src/page-objects/storefront/Wishlist.ts
new file mode 100644
index 0000000..41e402b
--- /dev/null
+++ b/src/page-objects/storefront/Wishlist.ts
@@ -0,0 +1,34 @@
+import type { Page, Locator } from '@playwright/test';
+import type { PageObject } from '../../types/PageObject';
+import { Home } from './Home';
+
+export class Wishlist extends Home implements PageObject {
+    public readonly wishListHeader: Locator;
+    public readonly removeAlert: Locator;
+    public readonly emptyListing: Locator;
+
+    public readonly offCanvas: Locator;
+    public readonly offCanvasCartTitle: Locator;
+    public readonly offCanvasCart: Locator;
+    public readonly offCanvasCartGoToCheckoutButton: Locator;
+    public readonly offCanvasLineItemImages: Locator;
+    public readonly offCanvasSummaryTotalPrice: Locator;
+
+    constructor(public readonly page: Page) {
+        super(page);
+        this.wishListHeader = page.locator('.wishlist-headline');
+        this.removeAlert = page.locator('.alert-content');
+        this.emptyListing = page.locator('.wishlist-listing-empty');
+
+        this.offCanvas = page.locator('offcanvas-body');
+        this.offCanvasCartTitle = page.getByText('Shopping cart', { exact: true });
+        this.offCanvasCart = page.getByRole('dialog');
+        this.offCanvasCartGoToCheckoutButton = page.getByRole('link', { name: 'Go to checkout' });
+        this.offCanvasLineItemImages = page.locator('.line-item-img-link');
+        this.offCanvasSummaryTotalPrice = page.locator('.offcanvas-summary').locator('dt:has-text("Subtotal") + dd');
+    }
+
+    url() {
+        return `wishlist`;
+    }
+}
\ No newline at end of file
diff --git a/src/tasks/shop-customer-tasks.ts b/src/tasks/shop-customer-tasks.ts
index 97d4178..f390f5c 100644
--- a/src/tasks/shop-customer-tasks.ts
+++ b/src/tasks/shop-customer-tasks.ts
@@ -24,8 +24,9 @@ import { OpenSearchSuggestPage } from './shop-customer/Search/OpenSearchSuggestP
 import { SearchForTerm } from './shop-customer/Search/SearchForTerm';
 
 import { ValidateAccessibility } from './shop-customer/Accessibility/ValidateAccessibility';
-import { AddProductToWishlist } from './shop-customer/Wishlist/addProductToWishlist';
 import { RemoveProductFromWishlist } from './shop-customer/Wishlist/RemoveProductFromWishlist';
+import { AddProductToCartFromWishlist } from './shop-customer/Wishlist/AddProductToCartFromWishlist';
+import { AddProductToWishlist } from './shop-customer/Wishlist/AddProductToWishlist';
 
 export const test = mergeTests(
     Login,
@@ -48,6 +49,7 @@ export const test = mergeTests(
     OpenSearchSuggestPage,
     SearchForTerm,
     ValidateAccessibility,
-    AddProductToWishlist,
-    RemoveProductFromWishlist
+    RemoveProductFromWishlist,
+    AddProductToCartFromWishlist,
+    AddProductToWishlist
 );
diff --git a/src/tasks/shop-customer/Wishlist/AddProductToCartFromWishlist.ts b/src/tasks/shop-customer/Wishlist/AddProductToCartFromWishlist.ts
new file mode 100644
index 0000000..4e11c3f
--- /dev/null
+++ b/src/tasks/shop-customer/Wishlist/AddProductToCartFromWishlist.ts
@@ -0,0 +1,20 @@
+import { test as base } from '@playwright/test';
+import type { Task } from '../../../types/Task';
+import type { FixtureTypes } from '../../../types/FixtureTypes';
+import { Product } from '../../../types/ShopwareTypes';
+
+export const AddProductToCartFromWishlist = base.extend<{ AddProductToCartFromWishlist: Task }, FixtureTypes>({
+    AddProductToCartFromWishlist: async ({ ShopCustomer, StorefrontWishlist }, use) => {
+        const task = (ProductData: Product) => {
+            return async function AddProductToCart() {
+                const listedItem = await StorefrontWishlist.getListingItemByProductId(ProductData.id);
+                await listedItem.productAddToShoppingCart.click();
+                await StorefrontWishlist.page.waitForResponse((response) => response.url().includes(`checkout/offcanvas`) && response.ok());
+                await ShopCustomer.expects(StorefrontWishlist.offCanvasCartTitle).toBeVisible();
+                await ShopCustomer.expects(StorefrontWishlist.offCanvasCart.getByText(ProductData.name)).toBeVisible();
+            }
+        };
+
+        await use(task);
+    },
+});
\ No newline at end of file
diff --git a/src/tasks/shop-customer/Wishlist/AddProductToWishlist.ts b/src/tasks/shop-customer/Wishlist/AddProductToWishlist.ts
new file mode 100644
index 0000000..a9ca593
--- /dev/null
+++ b/src/tasks/shop-customer/Wishlist/AddProductToWishlist.ts
@@ -0,0 +1,18 @@
+import { test as base } from '@playwright/test';
+import type { Task } from '../../../types/Task';
+import type { FixtureTypes } from '../../../types/FixtureTypes';
+import { Product } from '../../../types/ShopwareTypes';
+
+export const AddProductToWishlist = base.extend<{ AddProductToWishlist: Task }, FixtureTypes>({
+    AddProductToWishlist: async ({ StorefrontHome , StorefrontWishlist, ShopCustomer}, use) => {
+        const task = (ProductData: Product) => {
+            return async function AddProductToWishlist() {
+                const listedItem = await StorefrontHome.getListingItemByProductId(ProductData.id);
+                await listedItem.wishlistNotAddedIcon.click();
+                await ShopCustomer.expects(listedItem.wishlistAddedIcon).toBeVisible();
+            }
+        };
+
+        await use(task);
+    },
+});
\ No newline at end of file
diff --git a/src/tasks/shop-customer/Wishlist/RemoveProductFromWishlist.ts b/src/tasks/shop-customer/Wishlist/RemoveProductFromWishlist.ts
new file mode 100644
index 0000000..dcc8826
--- /dev/null
+++ b/src/tasks/shop-customer/Wishlist/RemoveProductFromWishlist.ts
@@ -0,0 +1,18 @@
+import { test as base } from '@playwright/test';
+import type { Task } from '../../../types/Task';
+import type { FixtureTypes } from '../../../types/FixtureTypes';
+import { Product } from '../../../types/ShopwareTypes';
+
+export const RemoveProductFromWishlist = base.extend<{ RemoveProductFromWishlist: Task }, FixtureTypes>({
+    RemoveProductFromWishlist: async ({ StorefrontHome , StorefrontWishlist}, use) => {
+        const task = (ProductData: Product) => {
+            return async function AddProductToWishlist() {
+                const listedItem = await StorefrontHome.getListingItemByProductId(ProductData.id);
+                await listedItem.wishlistAddedIcon.click();
+                await StorefrontWishlist.page.waitForResponse((response) => response.url().includes(`remove/${ProductData.id}`) && response.ok());
+            }
+        };
+
+        await use(task);
+    },
+});
\ No newline at end of file