diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart
index aed4d3a2d..0f1b41bb9 100644
--- a/lib/ui/app/view_scaffold.dart
+++ b/lib/ui/app/view_scaffold.dart
@@ -1,4 +1,6 @@
 // Flutter imports:
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
 
 // Package imports:
@@ -55,7 +57,7 @@ class ViewScaffold extends StatelessWidget {
     if (isDesktop(context)) {
       if (isFilter == true &&
           entity.entityType == state.uiState.filterEntityType) {
-        if (state.uiState.filterStack.length > 1) {
+        if (state.uiState.filterStack.length > 1 && !isFilter) {
           leading = IconButton(
             icon: Icon(Icons.arrow_back),
             onPressed: () => store.dispatch(PopFilterStack()),