diff --git a/gpgui/index.html b/gpgui/index.html
index 3901673..fcdeb15 100644
--- a/gpgui/index.html
+++ b/gpgui/index.html
@@ -4,12 +4,13 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0" />
-    <title>Vite + React + TS</title>
+    <title>GlobalProtect</title>
   </head>
   <body data-tauri-drag-region>
     <script>
+      /* workaround to webview font size auto scaling */
       var htmlFontSize = getComputedStyle(document.documentElement).fontSize;
-      var ratio = parseInt(htmlFontSize) / 16;
+      var ratio = parseInt(htmlFontSize, 10) / 16;
       document.documentElement.style.fontSize = (16 / ratio) + 'px';
     </script>
     <div id="root"></div>
diff --git a/gpgui/src/components/ConnectForm/PortalForm.tsx b/gpgui/src/components/ConnectForm/PortalForm.tsx
index 14a97ef..807fd52 100644
--- a/gpgui/src/components/ConnectForm/PortalForm.tsx
+++ b/gpgui/src/components/ConnectForm/PortalForm.tsx
@@ -35,7 +35,7 @@ export default function PortalForm() {
   }
 
   return (
-    <form onSubmit={handleSubmit}>
+    <form onSubmit={handleSubmit} data-tauri-drag-region>
       <TextField
         autoFocus
         label="Portal address"
diff --git a/gpgui/src/components/ConnectionStatus/StatusIcon.tsx b/gpgui/src/components/ConnectionStatus/StatusIcon.tsx
index f7a3a9d..cb761c0 100644
--- a/gpgui/src/components/ConnectionStatus/StatusIcon.tsx
+++ b/gpgui/src/components/ConnectionStatus/StatusIcon.tsx
@@ -93,17 +93,11 @@ function InnerStatusIcon() {
   return <DisconnectedIcon />;
 }
 
-const DragRegion = styled(Box)(({ theme }) => ({
-  position: "absolute",
-  inset: 0,
-}));
-
 export default function StatusIcon() {
   return (
     <IconContainer>
       <BackgroundIcon />
       <InnerStatusIcon />
-      <DragRegion data-tauri-drag-region />
     </IconContainer>
   );
 }
diff --git a/gpgui/src/components/ConnectionStatus/StatusText.tsx b/gpgui/src/components/ConnectionStatus/StatusText.tsx
index 3382724..d2e06dd 100644
--- a/gpgui/src/components/ConnectionStatus/StatusText.tsx
+++ b/gpgui/src/components/ConnectionStatus/StatusText.tsx
@@ -7,7 +7,6 @@ export default function StatusText() {
 
   return (
     <Typography
-      data-tauri-drag-region
       textAlign="center"
       mt={1.5}
       variant="subtitle1"
diff --git a/gpgui/src/components/ConnectionStatus/index.tsx b/gpgui/src/components/ConnectionStatus/index.tsx
index 401c957..cceba2f 100644
--- a/gpgui/src/components/ConnectionStatus/index.tsx
+++ b/gpgui/src/components/ConnectionStatus/index.tsx
@@ -4,9 +4,10 @@ import StatusText from "./StatusText";
 
 export default function ConnectionStatus() {
   return (
-    <Box data-tauri-drag-region>
+    <Box position="relative">
       <StatusIcon />
       <StatusText />
+      <Box data-tauri-drag-region position="absolute" sx={{ inset: 0 }} />
     </Box>
   );
 }
diff --git a/gpgui/src/components/Feedback/index.tsx b/gpgui/src/components/Feedback/index.tsx
index d4731a4..e00393d 100644
--- a/gpgui/src/components/Feedback/index.tsx
+++ b/gpgui/src/components/Feedback/index.tsx
@@ -15,7 +15,12 @@ const LinkChip = (props: ChipProps<"a">) => (
 
 export default function Feedback() {
   return (
-    <Stack direction="row" justifyContent="space-evenly" mt={1}>
+    <Stack
+      direction="row"
+      justifyContent="space-evenly"
+      mt={1}
+      data-tauri-drag-region
+    >
       <LinkChip
         avatar={<BugReport />}
         label="Feedback"
diff --git a/gpgui/src/components/MainMenu/index.tsx b/gpgui/src/components/MainMenu/index.tsx
index f3b5e34..941e9e2 100644
--- a/gpgui/src/components/MainMenu/index.tsx
+++ b/gpgui/src/components/MainMenu/index.tsx
@@ -16,6 +16,7 @@ import { isProcessingAtom, statusAtom } from "../../atoms/status";
 
 const MenuContainer = styled(Box)(({ theme }) => ({
   position: "absolute",
+  zIndex: 1,
   left: theme.spacing(1),
   top: theme.spacing(1),
 }));
@@ -100,6 +101,7 @@ export default function MainMenu() {
         target="_blank"
         sx={{
           position: "absolute",
+          zIndex: 1,
           right: (theme) => theme.spacing(1),
           top: (theme) => theme.spacing(1),
         }}
diff --git a/gpgui/src/components/Notification/index.tsx b/gpgui/src/components/Notification/index.tsx
index 32e7c57..ef26d3c 100644
--- a/gpgui/src/components/Notification/index.tsx
+++ b/gpgui/src/components/Notification/index.tsx
@@ -1,4 +1,11 @@
-import { Alert, AlertTitle, Box, Slide, SlideProps, Snackbar } from "@mui/material";
+import {
+  Alert,
+  AlertTitle,
+  Box,
+  Slide,
+  SlideProps,
+  Snackbar,
+} from "@mui/material";
 import { useAtom, useAtomValue } from "jotai";
 import {
   closeNotificationAtom,
