diff --git a/01-frontend/src/helper/navbar/NavBar.css b/01-frontend/src/helper/navbar/NavBar.css
index b85e29e..e3ebec2 100644
--- a/01-frontend/src/helper/navbar/NavBar.css
+++ b/01-frontend/src/helper/navbar/NavBar.css
@@ -5,6 +5,7 @@
     position: absolute;
     top: 0;
     width: 100%;
+    overflow-x: hidden;
 }
 
 /* Logo styles */
diff --git a/01-frontend/src/helper/navbar/NavBar.tsx b/01-frontend/src/helper/navbar/NavBar.tsx
index e55b271..fe2a70d 100644
--- a/01-frontend/src/helper/navbar/NavBar.tsx
+++ b/01-frontend/src/helper/navbar/NavBar.tsx
@@ -164,7 +164,7 @@ export default function NavBar() {
                     </Box>
 
                     <ThemeToggle />
-                    <Tooltip title={t('openSettings')}>
+                    <Tooltip title={t('openSettings')} placement='bottom-end'>
                         <IconButton onClick={handleOpenUserMenu} sx={{ p: 0 }}>
                             <Avatar alt="Florian Speicher" src="/static/images/avatar/2.jpg" />
                         </IconButton>