diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index b3802db090..c4f4708b9b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -279,7 +279,7 @@ public class FragmentAccounts extends FragmentBase {
             }
         });
 
-        animator = Helper.getFabAnimator(fab, this);
+        animator = Helper.getFabAnimator(fab, getViewLifecycleOwner());
 
         // Initialize
         FragmentDialogTheme.setBackground(getContext(), view, false);
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
index ef155c64a4..ac3220dc8d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
@@ -180,7 +180,7 @@ public class FragmentIdentities extends FragmentBase {
             }
         });
 
-        animator = Helper.getFabAnimator(fab, this);
+        animator = Helper.getFabAnimator(fab, getViewLifecycleOwner());
 
         // Initialize
         FragmentDialogTheme.setBackground(getContext(), view, false);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a50a587765..85ecefad27 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -547,7 +547,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         fabSearch = view.findViewById(R.id.fabSearch);
         fabError = view.findViewById(R.id.fabError);
 
-        animator = Helper.getFabAnimator(fabSearch, this);
+        animator = Helper.getFabAnimator(fabSearch, getViewLifecycleOwner());
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());