diff --git a/app/gabsocial/components/sidebar_menu.js b/app/gabsocial/components/sidebar_menu.js
index 629456e7c..c275ba647 100644
--- a/app/gabsocial/components/sidebar_menu.js
+++ b/app/gabsocial/components/sidebar_menu.js
@@ -117,10 +117,10 @@ class SidebarMenu extends ImmutablePureComponent {
                 <Icon id='envelope' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.messages)}</span>
               </NavLink>
-              <a className='sidebar-menu-item' href='/donate' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/donate' onClick={onClose}>
                 <Icon id='dollar' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.donate)}</span>
-              </a>
+              </NavLink>
               <NavLink className='sidebar-menu-item' to='/lists' onClick={onClose}>
                 <Icon id='list' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.lists)}</span>
@@ -144,14 +144,14 @@ class SidebarMenu extends ImmutablePureComponent {
                 <Icon id='times-circle' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.mutes)}</span>
               </NavLink>
-              <a className='sidebar-menu-item' href='/filters'>
+              <NavLink className='sidebar-menu-item' to='/filters' onClick={onClose}>
                 <Icon id='filter' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.filters)}</span>
-              </a>
-              <a className='sidebar-menu-item' href='/settings/preferences'>
+              </NavLink>
+              <NavLink className='sidebar-menu-item' to='/settings/preferences' onClick={onClose}>
                 <Icon id='cog' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.preferences)}</span>
-              </a>
+              </NavLink>
             </div>
 
             <div className='sidebar-menu__section'>
diff --git a/app/gabsocial/features/account/components/header.js b/app/gabsocial/features/account/components/header.js
index 5fdfe15c5..78b880dfa 100644
--- a/app/gabsocial/features/account/components/header.js
+++ b/app/gabsocial/features/account/components/header.js
@@ -80,10 +80,6 @@ class Header extends ImmutablePureComponent {
     isSmallScreen: (window.innerWidth <= 895),
   }
 
-  openEditProfile = () => {
-    window.open('/settings/profile', '_blank');
-  }
-
   isStatusesPageActive = (match, location) => {
     if (!match) {
       return false;
@@ -121,8 +117,8 @@ class Header extends ImmutablePureComponent {
     }
 
     if (account.get('id') === me) {
-      menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
-      menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+      menu.push({ text: intl.formatMessage(messages.edit_profile), to: '/settings/profile' });
+      menu.push({ text: intl.formatMessage(messages.preferences), to: '/settings/preferences' });
       menu.push(null);
       menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
       menu.push(null);