diff --git a/src/components/TitleBar.tsx b/src/components/TitleBar.tsx
index c7f11ef..9ee6184 100644
--- a/src/components/TitleBar.tsx
+++ b/src/components/TitleBar.tsx
@@ -94,32 +94,41 @@ const TitleBar: React.FC = () => {
   }
 
   return (
-    <div
-      className="h-8 bg-secondary-800 text-white flex items-center justify-between px-4 select-none"
-      onMouseDown={handleTitlebarMouseDown}
-    >
-      <div className="flex items-center space-x-2">
+    <div className="h-8 bg-secondary-800 text-white flex items-center justify-between px-4 select-none">
+      <div
+        className="flex items-center space-x-2 flex-1"
+        onMouseDown={handleTitlebarMouseDown}
+      >
         <div className="w-4 h-4 bg-primary-500 rounded-full flex items-center justify-center">
           <span className="text-xs font-bold">M</span>
         </div>
         <span className="text-sm font-medium">MixVideo V2</span>
       </div>
-      
+
       <div className="flex items-center space-x-1">
         <button
-          onClick={handleMinimize}
+          onClick={(e) => {
+            e.stopPropagation()
+            handleMinimize()
+          }}
           className="w-6 h-6 flex items-center justify-center hover:bg-secondary-700 rounded transition-colors"
         >
           <Minimize2 size={12} />
         </button>
         <button
-          onClick={handleMaximize}
+          onClick={(e) => {
+            e.stopPropagation()
+            handleMaximize()
+          }}
           className="w-6 h-6 flex items-center justify-center hover:bg-secondary-700 rounded transition-colors"
         >
           {isMaximized ? <Square size={12} /> : <Maximize2 size={12} />}
         </button>
         <button
-          onClick={handleClose}
+          onClick={(e) => {
+            e.stopPropagation()
+            handleClose()
+          }}
           className="w-6 h-6 flex items-center justify-center hover:bg-red-600 rounded transition-colors"
         >
           <X size={12} />