diff --git a/client/my-sites/themes/theme-showcase-header.jsx b/client/my-sites/themes/theme-showcase-header.jsx
index 902b1e7d34ebe..f6022adc88e00 100644
--- a/client/my-sites/themes/theme-showcase-header.jsx
+++ b/client/my-sites/themes/theme-showcase-header.jsx
@@ -82,25 +82,27 @@ export default function ThemeShowcaseHeader( {
<>
{ isLoggedIn ? (
- ,
- },
- }
- ) }
- >
- { showInstallThemeButton && }
- { isLoggedIn && ! isSiteWooExpressOrEcomFreeTrial && (
-
- ) }
-
+
+
,
+ },
+ }
+ ) }
+ >
+ { showInstallThemeButton &&
}
+ { isLoggedIn && ! isSiteWooExpressOrEcomFreeTrial && (
+
+ ) }
+
+
) : (
diff --git a/client/my-sites/themes/theme-showcase.jsx b/client/my-sites/themes/theme-showcase.jsx
index 590571a144aa3..8ca62d24790de 100644
--- a/client/my-sites/themes/theme-showcase.jsx
+++ b/client/my-sites/themes/theme-showcase.jsx
@@ -716,34 +716,36 @@ class ThemeShowcase extends Component {
'is-sticky': this.state.shouldThemeControlsSticky,
} ) }
>
-
-
- { isSearchV2 ? (
-
- ) : (
-
+
+
+
+ { isSearchV2 ? (
+
+ ) : (
+
+ ) }
+
+ { tabFilters && premiumThemesEnabled && ! isMultisite && (
+ <>
+
+ >
) }
- { tabFilters && premiumThemesEnabled && ! isMultisite && (
- <>
-
- >
- ) }
* {
- pointer-events: auto;
- }
+ border-bottom: initial;
+ position: static;
+ width: auto;
+ padding: 0;
}
}
}
@@ -560,6 +596,9 @@
.is-global-sidebar-visible & {
padding-top: 40px;
margin-top: -40px;
+ &.is-sticky {
+ height: auto;
+ }
}
&.is-sticky {