diff --git a/src/app/AppViewSwitcher.tsx b/src/app/AppViewSwitcher.tsx
index 599ace2e..93dc2547 100644
--- a/src/app/AppViewSwitcher.tsx
+++ b/src/app/AppViewSwitcher.tsx
@@ -33,9 +33,11 @@ const GAP_CLASS = 'mr-1.5 sm:mr-2';
 export default function AppViewSwitcher({
   currentSelection,
   className,
+  animateSearch = true,
 }: {
   currentSelection?: SwitcherSelection
   className?: string
+  animateSearch?: boolean
 }) {
   const pathname = usePathname();
   
@@ -170,7 +172,7 @@ export default function AppViewSwitcher({
             />
           </Switcher>
         </motion.div>}
-      <motion.div layout>
+      <motion.div layout={animateSearch}>
         <Switcher type="borderless">
           <SwitcherItem
             icon={<IconSearch includeTitle={false} />}
diff --git a/src/app/Nav.tsx b/src/app/Nav.tsx
index 2943056a..6c566d39 100644
--- a/src/app/Nav.tsx
+++ b/src/app/Nav.tsx
@@ -40,6 +40,7 @@ export default function Nav({
   const {
     classNameStickyContainer,
     classNameStickyNav,
+    isNavVisible,
   } = useStickyNav(ref);
 
   const renderLink = (
@@ -85,6 +86,7 @@ export default function Nav({
               <AppViewSwitcher
                 currentSelection={switcherSelectionForPath()}
                 className="translate-x-[-1px]"
+                animateSearch={isNavVisible}
               />
               <div className={clsx(
                 'grow text-right min-w-0',
diff --git a/src/app/useStickyNav.ts b/src/app/useStickyNav.ts
index 9f9d3cfe..627c4bdd 100644
--- a/src/app/useStickyNav.ts
+++ b/src/app/useStickyNav.ts
@@ -37,5 +37,8 @@ export default function useStickyNav(
     ),
   }), [isNavSticky, shouldAnimateStickyNav, shouldHideStickyNav]);
 
-  return classNames;
+  return {
+    ...classNames,
+    isNavVisible: !shouldHideStickyNav,
+  };
 };