diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index 385f82ed0..0c72f8d9e 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -454,8 +454,8 @@ class _DrawerTileState extends State<DrawerTile> {
                       ),
                 ),
           onTap: () {
+            store.dispatch(ClearEntityFilter());
             if (widget.entityType != null) {
-              store.dispatch(ClearEntityFilter());
               viewEntitiesByType(
                   context: context, entityType: widget.entityType);
             } else {
@@ -622,6 +622,10 @@ class SidebarFooterCollapsed extends StatelessWidget {
     final Store<AppState> store = StoreProvider.of<AppState>(context);
     final localization = AppLocalization.of(context);
 
+    if (store.state.uiState.filterEntityType != null) {
+      return SizedBox();
+    }
+
     return Container(
       width: double.infinity,
       color: Theme.of(context).cardColor,