diff --git a/src/App.tsx b/src/App.tsx
index 3f282f1..63931d5 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -331,9 +331,11 @@ export default function App() {
   return (
     <main className="appShell">
       <section className="titlebar">
-        <div className="titlebarBrand">
-          <div className="titlebarMark">EH</div>
-          <span>EnvHelper</span>
+        <div className="titlebarDrag">
+          <div className="titlebarBrand">
+            <div className="titlebarMark">EH</div>
+            <span>EnvHelper</span>
+          </div>
         </div>
         <div className="windowControls">
           <button aria-label="Minimize" onClick={() => window.envHelper?.minimizeWindow()} title="Minimize" type="button">
diff --git a/src/styles.css b/src/styles.css
index 4872b21..a024027 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -147,7 +147,6 @@ textarea:focus {
 }
 
 .titlebar {
-  -webkit-app-region: drag;
   align-items: center;
   background: color-mix(in srgb, var(--surface) 92%, var(--bg));
   border: 1px solid var(--border);
@@ -157,6 +156,15 @@ textarea:focus {
   overflow: hidden;
 }
 
+.titlebarDrag {
+  -webkit-app-region: drag;
+  align-items: center;
+  display: flex;
+  flex: 1;
+  height: 100%;
+  min-width: 0;
+}
+
 .titlebarBrand {
   align-items: center;
   color: var(--muted);
@@ -186,9 +194,12 @@ textarea:focus {
   display: flex;
   height: 100%;
   padding: 3px;
+  position: relative;
+  z-index: 2;
 }
 
 .windowControls button {
+  -webkit-app-region: no-drag;
   background: transparent;
   border: 1px solid transparent;
   border-radius: 6px;