diff --git a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts
index cff86811..035e8353 100644
--- a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts
+++ b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts
@@ -80,6 +80,8 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface {
 
   private readonly sortColumnDiv: (number: number) => string;
 
+  private readonly editGroupButton: (row: number) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on multistore page
@@ -123,6 +125,7 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface {
     this.tableColumnActionsToggleButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`;
     this.tableColumnActionsDropdownMenu = (row: number) => `${this.tableColumnActions(row)} .dropdown-menu`;
     this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.delete`;
+    this.editGroupButton = (row: number) => `${this.tableBodyColumn(row)} .btn-group a.edit`;
 
     // Confirmation modal
     this.deleteModalButtonYes = '#popup_ok';
@@ -220,7 +223,11 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface {
    * @return {Promise<void>}
    */
   async gotoEditShopGroupPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
+    if (await this.elementVisible(page, this.tableColumnActionsEditLink(row), 2000)) {
+      await page.locator(this.tableColumnActionsEditLink(row)).click();
+      return;
+    }
+    await page.locator(this.editGroupButton(row)).click();
   }
 
   /**