diff --git a/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx b/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx
index 9e0f854d7..6dbd27425 100644
--- a/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx
+++ b/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx
@@ -1,6 +1,4 @@
 "use client"
-
-import { useCallback, useEffect, useRef, useState } from "react"
 import { useIntl } from "react-intl"
 
 import useHotelPageStore from "@/stores/hotel-page"
@@ -14,60 +12,32 @@ export default function MobileMapToggle() {
   const { isDynamicMapOpen, openDynamicMap, closeDynamicMap } =
     useHotelPageStore()
 
-  const mapToggleRef = useRef<HTMLDivElement>(null)
-  const [isVisible, setIsVisible] = useState<boolean>(true)
-
-  const handleScroll = useCallback(() => {
-    if (mapToggleRef.current) {
-      const rect = mapToggleRef.current.getBoundingClientRect()
-      if (rect.top >= 150) {
-        setIsVisible(true)
-      } else {
-        setIsVisible(false)
-      }
-    }
-  }, [])
-
-  useEffect(() => {
-    handleScroll()
-
-    window.addEventListener("scroll", handleScroll)
-
-    return () => {
-      window.removeEventListener("scroll", handleScroll)
-    }
-  }, [handleScroll])
-
   return (
-    <div ref={mapToggleRef} className={styles.wrapper}>
-      <div
-        className={`${styles.mobileToggle} ${isVisible ? "" : styles.hidden}`}
+    <div className={styles.mobileToggle}>
+      <button
+        type="button"
+        className={`${styles.button} ${!isDynamicMapOpen ? styles.active : ""}`}
+        onClick={closeDynamicMap}
       >
-        <button
-          type="button"
-          className={`${styles.button} ${!isDynamicMapOpen ? styles.active : ""}`}
-          onClick={closeDynamicMap}
-        >
-          <HouseIcon
-            color={!isDynamicMapOpen ? "white" : "red"}
-            height={24}
-            width={24}
-          />
-          <span>{intl.formatMessage({ id: "Hotel" })}</span>
-        </button>
-        <button
-          type="button"
-          className={`${styles.button} ${isDynamicMapOpen ? styles.active : ""}`}
-          onClick={openDynamicMap}
-        >
-          <MapIcon
-            color={isDynamicMapOpen ? "white" : "red"}
-            height={24}
-            width={24}
-          />
-          <span>{intl.formatMessage({ id: "Map" })}</span>
-        </button>
-      </div>
+        <HouseIcon
+          color={!isDynamicMapOpen ? "white" : "red"}
+          height={24}
+          width={24}
+        />
+        <span>{intl.formatMessage({ id: "Hotel" })}</span>
+      </button>
+      <button
+        type="button"
+        className={`${styles.button} ${isDynamicMapOpen ? styles.active : ""}`}
+        onClick={openDynamicMap}
+      >
+        <MapIcon
+          color={isDynamicMapOpen ? "white" : "red"}
+          height={24}
+          width={24}
+        />
+        <span>{intl.formatMessage({ id: "Map" })}</span>
+      </button>
     </div>
   )
 }
diff --git a/components/ContentType/HotelPage/Map/MobileMapToggle/mobileToggle.module.css b/components/ContentType/HotelPage/Map/MobileMapToggle/mobileToggle.module.css
index 617ed2dfb..99b9c9c13 100644
--- a/components/ContentType/HotelPage/Map/MobileMapToggle/mobileToggle.module.css
+++ b/components/ContentType/HotelPage/Map/MobileMapToggle/mobileToggle.module.css
@@ -1,11 +1,5 @@
-.wrapper {
-  margin: 0 auto;
-  position: sticky;
-  bottom: var(--Spacing-x5);
-  z-index: 1;
-}
-
 .mobileToggle {
+  position: sticky;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   gap: var(--Spacing-x-half);
@@ -14,6 +8,9 @@
   background-color: var(--Base-Surface-Primary-light-Normal);
   box-shadow: 0 0 30px 2px rgba(0, 0, 0, 0.15);
   padding: var(--Spacing-x-half);
+  margin: 0 auto;
+  bottom: var(--Spacing-x5);
+  z-index: 1;
 }
 
 .button {
@@ -43,12 +40,8 @@
   background-color: var(--Primary-Strong-Surface-Hover);
 }
 
-.hidden {
-  display: none;
-}
-
 @media screen and (min-width: 1367px) {
-  .wrapper {
+  .mobileToggle {
     display: none;
   }
 }
diff --git a/components/ContentType/HotelPage/TabNavigation/tabNavigation.module.css b/components/ContentType/HotelPage/TabNavigation/tabNavigation.module.css
index 1c4b051c9..702f7d1fc 100644
--- a/components/ContentType/HotelPage/TabNavigation/tabNavigation.module.css
+++ b/components/ContentType/HotelPage/TabNavigation/tabNavigation.module.css
@@ -1,7 +1,7 @@
 .stickyWrapper {
   position: sticky;
   top: var(--booking-widget-mobile-height);
-  z-index: 1;
+  z-index: 2;
   background-color: var(--Base-Surface-Subtle-Normal);
   border-bottom: 1px solid var(--Base-Border-Subtle);
   overflow-x: auto;
diff --git a/components/ContentType/HotelPage/hotelPage.module.css b/components/ContentType/HotelPage/hotelPage.module.css
index 771c4e76e..09f900159 100644
--- a/components/ContentType/HotelPage/hotelPage.module.css
+++ b/components/ContentType/HotelPage/hotelPage.module.css
@@ -11,6 +11,7 @@
     "mapContainer";
   margin: 0 auto;
   max-width: var(--max-width);
+  z-index: 0;
 }
 
 .hotelImages {