diff --git a/client/modules/User/components/DashboardTabSwitcher.jsx b/client/modules/User/components/DashboardTabSwitcher.jsx
index 4b657b01..cab9132c 100644
--- a/client/modules/User/components/DashboardTabSwitcher.jsx
+++ b/client/modules/User/components/DashboardTabSwitcher.jsx
@@ -12,7 +12,7 @@ const Tab = ({ children, isSelected, to }) => {
   const selectedClassName = 'dashboard-header__tab--selected';
 
   const location = { pathname: to, state: { skipSavingPath: true } };
-  const content = isSelected ? children : <Link to={location}>{children}</Link>;
+  const content = isSelected ? <span>{children}</span> : <Link to={location}>{children}</Link>;
   return (
     <li className={`dashboard-header__tab ${isSelected && selectedClassName}`}>
       <h4 className="dashboard-header__tab__title">
diff --git a/client/styles/components/_dashboard-header.scss b/client/styles/components/_dashboard-header.scss
index 57e6c626..5de7ec20 100644
--- a/client/styles/components/_dashboard-header.scss
+++ b/client/styles/components/_dashboard-header.scss
@@ -33,7 +33,7 @@
     color: getThemifyVariable('inactive-text-color');
     border-bottom: #{4 / $base-font-size}rem solid transparent;
 
-    padding: 0 0 #{8 / $base-font-size}rem 0;
+    padding: 0;
     margin-right: #{26 / $base-font-size}rem;
 
     &:hover, &:focus, &.dashboard-header__tab--selected {
@@ -56,7 +56,12 @@
 
 .dashboard-header__tab__title {
   margin: 0;
-  padding: 0 #{5 /$base-font-size}rem;
+  padding: 0;
+}
+
+.dashboard-header__tab__title > * {
+  display: inline-block;
+  padding: 0 #{5 /$base-font-size}rem #{5 /$base-font-size}rem;
 }
 
 .dashboard-header__nav {