diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue
index b18091bec..bcbfc7d1c 100644
--- a/webapp/components/FilterMenu/CategoriesFilter.vue
+++ b/webapp/components/FilterMenu/CategoriesFilter.vue
@@ -6,7 +6,7 @@
           :filled="!filteredCategoryIds.length"
           :label="$t('filter-menu.all')"
           icon="check"
-          @click="resetCategories"
+          @click="setResetCategories"
         />
       </li>
       <li class="item item-save-topics">
@@ -62,6 +62,10 @@ export default {
       resetCategories: 'posts/RESET_CATEGORIES',
       toggleCategory: 'posts/TOGGLE_CATEGORY',
     }),
+    setResetCategories() {
+      this.resetCategories()
+      this.$emit('showFilterMenu')
+    },
     saveCategories() {
       this.$apollo
         .mutate({
@@ -69,6 +73,7 @@ export default {
           variables: { activeCategories: this.filteredCategoryIds },
         })
         .then(() => {
+          this.$emit('showFilterMenu')
           this.$toast.success(this.$t('filter-menu.save.success'))
         })
         .catch(() => {
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index 0eb27cd2d..7a582a7c4 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" />
+      <categories-filter v-if="categoriesActive" @showFilterMenu="$emit('showFilterMenu')" />
     </div>
     <div class="filter-menu-options">
       <h2 class="title">{{ $t('filter-menu.order-by') }}</h2>
diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index 1a7548782..f96a287e4 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -179,7 +179,9 @@
             style="text-align: center"
           >
             <client-only>
-              <group-button />
+              <div @click="toggleMobileMenuView">
+                <group-button />
+              </div>
             </client-only>
           </ds-flex-item>
           <!-- map button -->
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index ca5ad7bd6..fde0a2a78 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -66,7 +66,9 @@
             </span>
 
             <div id="my-filter" v-if="showFilter">
-              <filter-menu-component />
+              <div @mouseleave="showFilter = false">
+                <filter-menu-component @showFilterMenu="showFilterMenu" />
+              </div>
             </div>
           </div>
         </div>
@@ -203,7 +205,7 @@ export default {
       toggleCategory: 'posts/TOGGLE_CATEGORY',
     }),
     showFilterMenu(e) {
-      if (!e.target.closest('#my-filter') && !e.target.closest('.my-filter-button')) {
+      if (!e || (!e.target.closest('#my-filter') && !e.target.closest('.my-filter-button'))) {
         if (!this.showFilter) return
         this.showFilter = false
       }