diff --git a/Dockerfile b/Dockerfile
index 3bdf7dfac3a..b88507e053e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN yarn install --frozen-lockfile
 
 COPY . /app
 
-RUN yarn build:dev
+RUN yarn build:dev --no-cache
 
 # since we need our chromium to run in 'headful' mode (for testing chrome extension)
 # we need a fake display (to run headful chromium), which we create by starting a Virtualized X server environment using xvfb-run
diff --git a/src/tests/end-to-end/common/element-identifiers/details-view-selectors.ts b/src/tests/end-to-end/common/element-identifiers/details-view-selectors.ts
index 63514286a65..d85954404cb 100644
--- a/src/tests/end-to-end/common/element-identifiers/details-view-selectors.ts
+++ b/src/tests/end-to-end/common/element-identifiers/details-view-selectors.ts
@@ -13,6 +13,7 @@ export const detailsViewSelectors = {
     gearButton: '.gear-options-icon',
     settingsButton: 'button[name="Settings"]',
     settingsPanel: '.settings-panel',
+    settingsPanelClose: 'button[title="Close settings panel"]',
     highContrastToggle: 'button#enable-high-contrast-mode',
     highContrastToggleCheckedStateSelector: 'button#enable-high-contrast-mode[aria-checked="true"]',
 };
diff --git a/src/tests/end-to-end/common/page-controllers/details-view-page.ts b/src/tests/end-to-end/common/page-controllers/details-view-page.ts
index e4952bb4dc4..f70d0fe82fa 100644
--- a/src/tests/end-to-end/common/page-controllers/details-view-page.ts
+++ b/src/tests/end-to-end/common/page-controllers/details-view-page.ts
@@ -39,12 +39,13 @@ export class DetailsViewPage extends Page {
     public async closeSettingsPanel(): Promise<void> {
         await this.waitForSelector(detailsViewSelectors.settingsPanel);
 
-        await this.keyPress('Escape');
+        await this.clickSelector(detailsViewSelectors.settingsPanelClose);
         await this.waitForSelectorToDisappear(detailsViewSelectors.settingsPanel);
     }
 
     public async enableHighContrast(): Promise<void> {
         await this.openSettingsPanel();
+        await this.waitForSelector(detailsViewSelectors.settingsPanelClose);
 
         await this.clickSelector(detailsViewSelectors.highContrastToggle);
         await this.waitForSelector(detailsViewSelectors.highContrastToggleCheckedStateSelector);