diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
index 65d9679c7..41188afe2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
@@ -160,7 +160,14 @@ public class TasksFragment extends BaseMainFragment {
         dialog.setTaskType(taskType, activeTaskFilters.get(taskType));
         dialog.setListener((activeTaskFilter, activeTags) -> {
             activeTaskFilters.put(taskType, activeTaskFilter);
+            int activePos = viewPager.getCurrentItem();
+            if (activePos >= 1) {
+                viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
+            }
             getActiveFragment().setActiveFilter(activeTaskFilter);
+            if (activePos < viewPager.getAdapter().getCount()) {
+                viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
+            }
             taskFilterHelper.setTags(activeTags);
         });
         dialog.show();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
index 5c898ce6a..6bfd692f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -134,23 +134,23 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
     }
 
     private void createTagViews() {
+        ColorStateList colorStateList = new ColorStateList(
+                new int[][]{
+
+                        new int[]{-android.R.attr.state_checked}, //disabled
+                        new int[]{android.R.attr.state_checked} //enabled
+                },
+                new int[] {
+
+                        Color.GRAY, //disabled
+                        ContextCompat.getColor(getContext(), R.color.brand_400) //enabled
+
+                }
+        );
         for (Tag tag : tags) {
             AppCompatCheckBox tagCheckbox = new AppCompatCheckBox(getContext());
             tagCheckbox.setText(tag.getName());
             tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,14);
-            ColorStateList colorStateList = new ColorStateList(
-                    new int[][]{
-
-                            new int[]{-android.R.attr.state_checked}, //disabled
-                            new int[]{android.R.attr.state_checked} //enabled
-                    },
-                    new int[] {
-
-                            Color.GRAY, //disabled
-                            ContextCompat.getColor(getContext(), R.color.brand_400) //enabled
-
-                    }
-            );
             CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList);
             tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 if (isChecked) {