diff --git a/packages/viewer/src/App.vue b/packages/viewer/src/App.vue
index c94e9eaef9..23ceae488b 100644
--- a/packages/viewer/src/App.vue
+++ b/packages/viewer/src/App.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 /**
- * Initial component of the App.
+ * Initial component of the App
  *
  * Will listen for screen size changes and commit this change to the store
  */
@@ -42,7 +42,7 @@ onMounted(() => {
     // initial load of layers config
     layersStore.loadLayersConfig(
         {
-            changeLayersOnTopicChange: !window.location.hash.includes('layers='),
+            changeLayersOnTopicChange: !window.location.hash.includes('layers=') && !window.location.hash.includes('bgLayer='),
         },
         dispatcher
     )
diff --git a/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue b/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue
index 43e2cfa02d..c3c6369948 100644
--- a/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue
+++ b/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue
@@ -61,7 +61,7 @@ const { show, animate, getImageForBackgroundLayer, toggleShowSelector, onSelectB
             class="bg-selector-squared-wheel-button position-relative"
             :class="{ opened: show, 'text-bg-secondary': show, animate }"
             type="button"
-            data-cy="background-selector-open-wheel-button"
+            data-cy="background-selector-open-wheel-button-squared"
             @click="toggleShowSelector"
         >
             <FontAwesomeIcon
diff --git a/packages/viewer/tests/cypress/tests-e2e/feedback.cy.ts b/packages/viewer/tests/cypress/tests-e2e/feedback.cy.ts
index a1092fb184..f6165f629d 100644
--- a/packages/viewer/tests/cypress/tests-e2e/feedback.cy.ts
+++ b/packages/viewer/tests/cypress/tests-e2e/feedback.cy.ts
@@ -30,10 +30,12 @@ describe('Testing the feedback form', () => {
         cy.get('[data-cy="feedback-form"]').should('be.visible')
         closeForm()
 
+        // Reset back to mobile view
         cy.viewport(320, 568)
-
+        cy.get('[data-cy="menu-button"].btn.menu-button').contains('Menu').should('be.visible')
         cy.log('It validates the report problem form properly')
         cy.openMenuIfMobile()
+
         openForm()
         cy.log('it is not possible to send a feedback without a rating')
         cy.get('[data-cy="text-area-input"]').type('This is an awesome feedback!')
@@ -115,6 +117,7 @@ describe('Testing the feedback form', () => {
 
         cy.get('[data-cy="feedback-close-successful"]').click()
         cy.get('[data-cy="feedback-form"]').should('not.exist')
+        // Form is already closed at this point
 
         cy.log('it shows a text to the user to tell him something went wrong')
         cy.openMenuIfMobile()
diff --git a/packages/viewer/tests/cypress/tests-e2e/menuTray.cy.ts b/packages/viewer/tests/cypress/tests-e2e/menuTray.cy.ts
index 009f8f5d40..2ee4b696f8 100644
--- a/packages/viewer/tests/cypress/tests-e2e/menuTray.cy.ts
+++ b/packages/viewer/tests/cypress/tests-e2e/menuTray.cy.ts
@@ -149,7 +149,6 @@ function measureMenu(shouldHaveMaxSize: boolean) {
 
 function init(nbLayers: number, nbSelectedLayers: number) {
     cy.goToMapView({
-        withHash: false,
         fixturesAndIntercepts: getFixturesAndIntercepts(nbLayers, nbSelectedLayers),
     })
     cy.getPinia().then((pinia) => {