diff --git a/src/frontend/src/Components/Map.scss b/src/frontend/src/Components/Map.scss
index acf84959a..00fd1c4a6 100644
--- a/src/frontend/src/Components/Map.scss
+++ b/src/frontend/src/Components/Map.scss
@@ -43,6 +43,7 @@
       .side-panel {
         transition: min-height 0.25s ease-in-out;
         order: 2;
+        overflow-y: auto;
 
         &.open {
           min-width: 100%;
@@ -52,11 +53,13 @@
     }
 
     .side-panel {
+      background-color: white;
       flex: 0;
       min-width: 0px;
       min-height: 0%;
       transition: min-width 0.25s ease-in-out;
-      overflow: hidden;
+      overflow-y: auto;
+      overflow-x: hidden;
       display: flex;
       flex-direction: column;
       position: relative;
@@ -65,6 +68,7 @@
       @media (max-width: 767px) {
         transition: min-height 0.25s ease-in-out;
         order: 2;
+        overflow-y: hidden;
       }
 
       &.open {
@@ -80,7 +84,6 @@
 
           .panel-content {
             min-width: 100%;
-            overflow-y: hidden;
           }
         }
       }
@@ -90,7 +93,6 @@
           min-height: 100%;
 
           .panel-content {
-            overflow-y: scroll;
           }
         }
       }
@@ -110,7 +112,6 @@
 
       .panel-content {
         flex: 1;
-        overflow-y: scroll;
       }
     }
 
diff --git a/src/frontend/src/Components/map/mapPopup.scss b/src/frontend/src/Components/map/mapPopup.scss
index 78fee5977..c511094be 100644
--- a/src/frontend/src/Components/map/mapPopup.scss
+++ b/src/frontend/src/Components/map/mapPopup.scss
@@ -33,7 +33,6 @@
       .name {
         font-size: 1.25rem;
         color: #053662;
-        cursor: pointer;
       }
     }
 
@@ -113,6 +112,14 @@
 
   // Cameras layer
   &--camera {
+    .popup__content {
+      &__title {
+        .name:hover {
+          cursor:pointer;
+          text-decoration: underline;
+        }
+      }
+    }
     .camera-orientations {
       padding: 0 1rem;
     }
@@ -124,11 +131,15 @@
       background-color: #FBFFFC;
       border-top: 4px solid #2E8540;
       
-      .name, .name a {
+      .name {
         color: #2E8540;
-
         a {
+          color: #2E8540;
           text-decoration: none;
+          &:hover {
+            cursor:pointer;
+            text-decoration: underline;
+          }
         }
       }