diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index 48ab54a9b..e7f96520d 100644
--- a/app/soapbox/features/ui/components/tabs_bar.js
+++ b/app/soapbox/features/ui/components/tabs_bar.js
@@ -12,7 +12,6 @@ import { openModal } from '../../../actions/modal';
 import { openSidebar } from '../../../actions/sidebar';
 import ThemeToggle from '../../ui/components/theme_toggle_container';
 import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import { getFeatures } from 'soapbox/utils/features';
 
 const messages = defineMessages({
   post: { id: 'tabs_bar.post', defaultMessage: 'Post' },
@@ -64,12 +63,13 @@ class TabsBar extends React.PureComponent {
                 <span><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></span>
               </Link>
             )}
-          </div>
-          <div className='tabs-bar__split tabs-bar__split--right'>
+
             <div className='tabs-bar__search-container'>
               <SearchContainer openInRoute />
             </div>
-            { account &&
+          </div>
+          <div className='tabs-bar__split tabs-bar__split--right'>
+            {account &&
               <>
                 <ThemeToggle />
                 <div className='tabs-bar__profile'>
diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss
index 1aff89d9b..1c5266e44 100644
--- a/app/styles/components/tabs-bar.scss
+++ b/app/styles/components/tabs-bar.scss
@@ -47,6 +47,7 @@
   &__search-container {
     display: block;
     width: 351px;
+    align-self: center;
 
     @media screen and (max-width: 895px) {
       display: none;