diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
index a8bdef350d6f..9c43d204e6ed 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
@@ -83,7 +83,7 @@ function Navbar(): JSX.Element {
'navbar--primary': style === 'primary',
'navbar-sidebar--show': sidebarShown,
[styles.navbarHideable]: hideOnScroll,
- [styles.navbarHidden]: !isNavbarVisible,
+ [styles.navbarHidden]: hideOnScroll && !isNavbarVisible,
})}>
diff --git a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
index 258c280515f0..3b5d053fbd63 100644
--- a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
@@ -33,7 +33,9 @@ function SkipToContent(): JSX.Element {
};
useEffect(() => {
- programmaticFocus(containerRef.current);
+ if (!location.hash) {
+ programmaticFocus(containerRef.current);
+ }
}, [location.pathname]);
return (
diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useHideableNavbar.ts b/packages/docusaurus-theme-classic/src/theme/hooks/useHideableNavbar.ts
index 47f414526dab..335cdc667850 100644
--- a/packages/docusaurus-theme-classic/src/theme/hooks/useHideableNavbar.ts
+++ b/packages/docusaurus-theme-classic/src/theme/hooks/useHideableNavbar.ts
@@ -75,6 +75,10 @@ const useHideableNavbar = (hideOnScroll: boolean): useHideableNavbarReturns => {
return;
}
+ if (!location.hash) {
+ return;
+ }
+
isFocusedAnchor.current = true;
}, [location.hash]);