diff --git a/client/src/styles/partials/bdsettings/contentview.scss b/client/src/styles/partials/bdsettings/contentview.scss
index 1fc44cdc..507f33de 100644
--- a/client/src/styles/partials/bdsettings/contentview.scss
+++ b/client/src/styles/partials/bdsettings/contentview.scss
@@ -15,13 +15,16 @@
         .bd-spinnerContainer {
             display: flex;
             justify-content: center;
-            padding: 50px 0;
         }
 
         .bd-onlinePhHeader {
             display: flex;
             padding: 0 20px 0 10px;
-            min-height: 40px;
+            min-height: 80px;
+
+            .bd-flexRow {
+                min-height: 40px;
+            }
 
             .bd-searchHint {
                 flex-grow: 1;
diff --git a/client/src/ui/components/bd/ThemesView.vue b/client/src/ui/components/bd/ThemesView.vue
index 042b6c99..71dbfd09 100644
--- a/client/src/ui/components/bd/ThemesView.vue
+++ b/client/src/ui/components/bd/ThemesView.vue
@@ -28,16 +28,20 @@
                 </ScrollerWrap>
             </div>
             <div v-else class="bd-onlinePh">
-                <div class="bd-onlinePhHeader">
-                    <div class="bd-searchHint">{{searchHint}}</div>
-                    <div class="bd-fancySearch" :class="{'bd-disabled': loadingOnline, 'bd-active': loadingOnline || (onlineThemes && onlineThemes.docs)}">
-                        <input type="text" class="bd-textInput" placeholder="Search" @keydown.enter="searchInput" @keyup.stop />
+                <div class="bd-onlinePhHeader bd-flexCol">
+                    <div class="bd-flex bd-flexRow">
+                        <div v-if="loadingOnline" class="bd-spinnerContainer">
+                            <div class="bd-spinner7" />
+                        </div>
+                        <div class="bd-searchHint">{{searchHint}}</div>
+                        <div class="bd-fancySearch" :class="{'bd-disabled': loadingOnline, 'bd-active': loadingOnline || (onlineThemes && onlineThemes.docs)}">
+                            <input type="text" class="bd-textInput" placeholder="Search" @keydown.enter="searchInput" @keyup.stop />
+                        </div>
                     </div>
-                    <div class="bd-searchSort">
-                        <span>Sort by:</span>
-                    </div>
-                    <div v-if="loadingOnline" class="bd-spinnerContainer">
-                        <div class="bd-spinner7"/>
+                    <div class="bd-flex bd-flexRow" v-if="onlineThemes && onlineThemes.docs && onlineThemes.docs.length">
+                        <div class="bd-searchSort">
+                            <span>Sort by:</span>
+                        </div>
                     </div>
                 </div>
                 <ScrollerWrap class="bd-onlinePhBody" v-if="!loadingOnline && onlineThemes" :scrollend="scrollend">