diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index f43268cf6..36fa9a483 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -19,7 +19,7 @@ const NavigationPanel = () => (
     <div className='flex-spacer' />
     <div className='flex-spacer' />
     <NavLink className='column-link column-link--transparent' to='/favourites'><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /><Icon className='column-link__icon' id='star' fixedWidth /></NavLink>
-    <a className='column-link column-link--transparent' href='/settings/preferences'><Icon className='column-link__icon' id='cog' fixedWidth /><FormattedMessage id='navigation_bar.preferences' defaultMessage='Preferences' /></a>
+    <a className='column-link column-link--transparent' href='/settings/preferences'><FormattedMessage id='navigation_bar.preferences' defaultMessage='Preferences' /><Icon className='column-link__icon' id='cog' fixedWidth /></a>
     <div className='flex-spacer' />
     <div className='flex-spacer' />
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /><Icon className='column-link__icon' id='bookmark' fixedWidth /></NavLink>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f133b6ed6..610dc17aa 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2436,6 +2436,8 @@ a.account__display-name {
 }
 
 .columns-area__panels__pane.columns-area__panels__pane--start.columns-area__panels__pane--navigational {
+  position: sticky;
+  top: 0;
   min-width: inherit !important;
 
   .columns-area__panels__pane__inner {