diff --git a/apps/readest-app/src/app/library/components/LibraryHeader.tsx b/apps/readest-app/src/app/library/components/LibraryHeader.tsx
index 878954c5..af1017e2 100644
--- a/apps/readest-app/src/app/library/components/LibraryHeader.tsx
+++ b/apps/readest-app/src/app/library/components/LibraryHeader.tsx
@@ -52,7 +52,7 @@ const LibraryHeader: React.FC<LibraryHeaderProps> = ({
     <div
       ref={headerRef}
       className={clsx(
-        'titlebar fixed z-10 w-full bg-gray-100 py-2 pr-6',
+        'titlebar z-10 w-full bg-gray-100 py-2 pr-6',
         isTrafficLightVisible ? 'pl-16' : 'pl-2',
       )}
     >
diff --git a/apps/readest-app/src/app/library/page.tsx b/apps/readest-app/src/app/library/page.tsx
index 22fb58d8..41bc990b 100644
--- a/apps/readest-app/src/app/library/page.tsx
+++ b/apps/readest-app/src/app/library/page.tsx
@@ -83,17 +83,18 @@ const LibraryPage = () => {
         onImportBooks={handleImportBooks}
         onToggleSelectMode={handleToggleSelectMode}
       />
-      <div className='min-h-screen pt-12'>
-        <div className='hero-content px-2 py-4'>
-          <Spinner loading={loading} />
-          <Bookshelf
-            libraryBooks={libraryBooks}
-            isSelectMode={isSelectMode}
-            onImportBooks={handleImportBooks}
-          />
-        </div>
-        {!loading && libraryBooks.length === 0 && (
-          <div className='hero min-h-screen'>
+      <div className='flex-grow pt-12'>
+        {loading || libraryBooks.length > 0 ? (
+          <div className='hero-content h-full overflow-y-auto px-2 py-4'>
+            <Spinner loading={loading} />
+            <Bookshelf
+              libraryBooks={libraryBooks}
+              isSelectMode={isSelectMode}
+              onImportBooks={handleImportBooks}
+            />
+          </div>
+        ) : (
+          <div className='hero h-full items-center justify-center'>
             <div className='hero-content text-neutral-content text-center'>
               <div className='max-w-md'>
                 <h1 className='mb-5 text-5xl font-bold'>Your Library</h1>
diff --git a/apps/readest-app/src/components/WindowButtons.tsx b/apps/readest-app/src/components/WindowButtons.tsx
index 9bdbb059..aeffad31 100644
--- a/apps/readest-app/src/components/WindowButtons.tsx
+++ b/apps/readest-app/src/components/WindowButtons.tsx
@@ -26,6 +26,15 @@ const WindowButtons: React.FC<WindowButtonsProps> = ({
 
   const handleMouseDown = async (e: MouseEvent) => {
     const target = e.target as HTMLElement;
+
+    if (
+      target.closest('#titlebar-minimize') ||
+      target.closest('#titlebar-maximize') ||
+      target.closest('#titlebar-close')
+    ) {
+      return;
+    }
+
     if (target.closest('#exclude-title-bar-mousedown')) {
       return;
     }