diff --git a/src/components/User/UserTooltip.scss b/src/components/User/UserTooltip.scss
index 1ea8d75d4..2d067e669 100644
--- a/src/components/User/UserTooltip.scss
+++ b/src/components/User/UserTooltip.scss
@@ -3,6 +3,7 @@
   .Tooltip {
     &.customer-data {
       .tooltip-target {
+        z-index: 0;
         display: flex;
         &>div:first-child {
           margin-left: -5px;
diff --git a/src/routes/settings/routes/profile/components/ProfileSettingsForm.scss b/src/routes/settings/routes/profile/components/ProfileSettingsForm.scss
index eb52f411f..cf759450e 100644
--- a/src/routes/settings/routes/profile/components/ProfileSettingsForm.scss
+++ b/src/routes/settings/routes/profile/components/ProfileSettingsForm.scss
@@ -84,6 +84,7 @@
           margin-bottom: 0;
         }
          :global(.Dropdown) {
+          overflow-y: scroll;
           height: 120px;
         }
       }