diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue
index 5db8d1fdd..b18091bec 100644
--- a/webapp/components/FilterMenu/CategoriesFilter.vue
+++ b/webapp/components/FilterMenu/CategoriesFilter.vue
@@ -47,9 +47,6 @@ export default {
     LabeledButton,
   },
   mixins: [SortCategories],
-  props: {
-    showMobileMenu: { type: Boolean, default: false },
-  },
   data() {
     return {
       categories: [],
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 2d4d836d5..ef4614764 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -11,7 +11,7 @@
       <base-icon class="dropdown-arrow" name="angle-down" />
     </base-button>
     <template slot="popover">
-      <filter-menu-component :showMobileMenu="showMobileMenu" />
+      <filter-menu-component />
     </template>
   </dropdown>
 </template>
@@ -29,7 +29,6 @@ export default {
   props: {
     placement: { type: String },
     offset: { type: [String, Number] },
-    showMobileMenu: { type: Boolean, default: false },
   },
   computed: {
     ...mapGetters({
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index 3f22aaed8..0eb27cd2d 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -3,7 +3,7 @@
     <div class="filter-menu-options">
       <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
       <following-filter />
-      <categories-filter v-if="categoriesActive" :showMobileMenu="showMobileMenu" />
+      <categories-filter v-if="categoriesActive" />
     </div>
     <div class="filter-menu-options">
       <h2 class="title">{{ $t('filter-menu.order-by') }}</h2>
@@ -28,9 +28,6 @@ export default {
       categoriesActive: this.$env.CATEGORIES_ACTIVE,
     }
   },
-  props: {
-    showMobileMenu: { type: Boolean, default: false },
-  },
 }
 </script>
 
diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index f1883b0cc..1a7548782 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -149,7 +149,7 @@
             style="flex-grow: 0; flex-basis: auto; padding: 20px 0"
           >
             <client-only>
-              <filter-menu v-show="showFilterMenuDropdown" :showMobileMenu="showMobileMenu" />
+              <filter-menu v-if="showFilterMenuDropdown && SHOW_CONTENT_FILTER_HEADER_MENU" />
             </client-only>
           </ds-flex-item>
         </ds-flex>
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 48043e3b9..524a530d1 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -5,7 +5,7 @@
     </div>
     <ds-container>
       <div class="main-container">
-        <nuxt :showMobileMenu="showMobileMenu" />
+        <nuxt />
       </div>
     </ds-container>
     <page-footer v-if="!isMobile" />
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 28c9f0793..ca5ad7bd6 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -23,7 +23,7 @@
         v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID"
         :row-span="1"
         column-span="fullWidth"
-        class="top-info-bar"
+        class="top-filter-menu"
       >
         <div class="filterButtonBox">
           <div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
@@ -66,7 +66,7 @@
             </span>
 
             <div id="my-filter" v-if="showFilter">
-              <filter-menu-component :showMobileMenu="showMobileMenu" />
+              <filter-menu-component />
             </div>
           </div>
         </div>
@@ -139,9 +139,6 @@ export default {
     FilterMenuComponent,
   },
   mixins: [postListActions],
-  props: {
-    showMobileMenu: { type: Boolean, default: false },
-  },
   data() {
     const { hashtag = null } = this.$route.query
     return {
@@ -341,7 +338,8 @@ export default {
   box-shadow: $box-shadow-x-large;
 }
 
-.top-info-bar {
+.top-info-bar,
+.top-filter-menu {
   display: flex;
   align-items: center;
 }