diff --git a/end-to-end-test/remote/screenshots/reference/generic_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png b/end-to-end-test/remote/screenshots/reference/generic_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png
index ce64a2d422a..70806aa8800 100644
Binary files a/end-to-end-test/remote/screenshots/reference/generic_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png and b/end-to-end-test/remote/screenshots/reference/generic_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png differ
diff --git a/end-to-end-test/remote/specs/core/studyview.spec.js b/end-to-end-test/remote/specs/core/studyview.spec.js
index ad4aee394f8..687a96951d9 100644
--- a/end-to-end-test/remote/specs/core/studyview.spec.js
+++ b/end-to-end-test/remote/specs/core/studyview.spec.js
@@ -395,9 +395,13 @@ describe('crc_msk_2017 study tests', () => {
         $(ADD_CHART_BUTTON).waitForDisplayed({
             timeout: WAIT_FOR_VISIBLE_TIMEOUT,
         });
-        $(ADD_CHART_BUTTON).waitForEnabled({
-            timeout: WAIT_FOR_VISIBLE_TIMEOUT,
-        });
+        browser.waitUntil(
+            () =>
+                !$(ADD_CHART_BUTTON)
+                    .getAttribute('class')
+                    .includes('disabled'),
+            { timeout: WAIT_FOR_VISIBLE_TIMEOUT }
+        );
         setDropdownOpen(
             true,
             ADD_CHART_BUTTON,
@@ -723,9 +727,13 @@ describe('submit genes to results view query', () => {
         });
         it('generic assay chart should be added in the summary tab', function() {
             this.retries(0);
-            $(ADD_CHART_BUTTON).waitForEnabled({
-                timeout: 60000,
-            });
+            browser.waitUntil(
+                () =>
+                    !$(ADD_CHART_BUTTON)
+                        .getAttribute('class')
+                        .includes('disabled'),
+                { timeout: 60000 }
+            );
             $(ADD_CHART_BUTTON).click();
 
             // Change to GENERIC ASSAY tab