diff --git a/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/index.tsx b/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/index.tsx
index dd0a0e7c2..3f608b440 100644
--- a/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/index.tsx
+++ b/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/index.tsx
@@ -96,6 +96,7 @@ export default function Sidebar({
         <Button
           theme="base"
           intent="text"
+          wrapping
           fullWidth
           className={styles.sidebarToggle}
           onClick={toggleFullScreenSidebar}
diff --git a/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/sidebar.module.css b/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/sidebar.module.css
index 6c54b131e..b552b940f 100644
--- a/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/sidebar.module.css
+++ b/components/ContentType/HotelPage/Map/DynamicMap/Sidebar/sidebar.module.css
@@ -84,12 +84,13 @@
     bottom: 0;
   }
 
-  .sidebarToggle {
+  button.sidebarToggle {
     position: relative;
     margin-top: var(--Spacing-x4);
+    padding: var(--Spacing-x2) !important;
   }
 
-  .sidebarToggle::before {
+  button.sidebarToggle::before {
     content: "";
     position: absolute;
     display: block;
diff --git a/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx b/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx
index 6dbd27425..7314ab0a6 100644
--- a/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx
+++ b/components/ContentType/HotelPage/Map/MobileMapToggle/index.tsx
@@ -4,6 +4,7 @@ import { useIntl } from "react-intl"
 import useHotelPageStore from "@/stores/hotel-page"
 
 import { HouseIcon, MapIcon } from "@/components/Icons"
+import { trackHotelMapClick } from "@/utils/tracking"
 
 import styles from "./mobileToggle.module.css"
 
@@ -12,6 +13,11 @@ export default function MobileMapToggle() {
   const { isDynamicMapOpen, openDynamicMap, closeDynamicMap } =
     useHotelPageStore()
 
+  function handleOpenMapClick() {
+    openDynamicMap()
+    trackHotelMapClick()
+  }
+
   return (
     <div className={styles.mobileToggle}>
       <button
@@ -29,7 +35,7 @@ export default function MobileMapToggle() {
       <button
         type="button"
         className={`${styles.button} ${isDynamicMapOpen ? styles.active : ""}`}
-        onClick={openDynamicMap}
+        onClick={handleOpenMapClick}
       >
         <MapIcon
           color={isDynamicMapOpen ? "white" : "red"}