diff --git a/build-and-publish-app-release.sh b/build-and-publish-app-release.sh
index 5a49357e..18c3d1c4 100644
--- a/build-and-publish-app-release.sh
+++ b/build-and-publish-app-release.sh
@@ -91,9 +91,9 @@ echo "🔨 Starting build process..."
 rm -rf $outputFolder
 mkdir -p $outputFolder
 
-# Run expo export with the specified output folder
-echo "📦 Exporting Expo bundle..."
-if ! npx expo export --output-dir $outputFolder; then
+# Run expo export with the specified output folder (excluding web)
+echo "📦 Exporting Expo bundle (Android & iOS only)..."
+if ! npx expo export --output-dir $outputFolder --platform android --platform ios; then
   echo "❌ Error: Expo export failed"
   exit 1
 fi
diff --git a/src/navigation/AppNavigator.tsx b/src/navigation/AppNavigator.tsx
index 2a81e2c2..f7957ffc 100644
--- a/src/navigation/AppNavigator.tsx
+++ b/src/navigation/AppNavigator.tsx
@@ -468,7 +468,11 @@ const MainTabs = () => {
     if (isHomeLoading) {
       return null;
     }
-    
+
+    // Get current route name to determine if we should keep navigation fixed
+    const currentRoute = props.state.routes[props.state.index]?.name;
+    const shouldKeepFixed = currentRoute === 'Search' || currentRoute === 'Library';
+
     if (isTablet) {
       // Top floating, text-only pill nav for tablets
       return (
@@ -481,7 +485,7 @@ const MainTabs = () => {
           alignItems: 'center',
           backgroundColor: 'transparent',
           zIndex: 100,
-        }, {
+        }, shouldKeepFixed ? {} : {
           transform: [{ translateY }],
           opacity: fade,
         }]}>