diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index 231356c24..220720189 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -304,12 +304,11 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 								0,
 								fab.getHeight() * 2);
 						animate.setDuration(300);
-						animate.setFillAfter(true);
 						fab.startAnimation(animate);
 						fab.setVisibility(View.INVISIBLE);
 						scrollDiff = 0;
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-						if (list.getChildLayoutPosition(list.getChildAt(0)) == 0 || scrollDiff > 400) {
+						if (list.getChildAt(0).getTop() == 0 || scrollDiff > 400) {
 							fab.setVisibility(View.VISIBLE);
 							TranslateAnimation animate = new TranslateAnimation(
 									0,
@@ -317,7 +316,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 									fab.getHeight() * 2,
 									0);
 							animate.setDuration(300);
-							animate.setFillAfter(true);
 							fab.startAnimation(animate);
 							scrollDiff = 0;
 						} else {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 18f4b67aa..e4d087476 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -798,7 +798,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 						0,
 						fab.getHeight() * 2);
 				animate.setDuration(300);
-				animate.setFillAfter(true);
 				fab.startAnimation(animate);
 				fab.setVisibility(View.INVISIBLE);
 				scrollDiff = 0;
@@ -811,7 +810,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 							fab.getHeight() * 2,
 							0);
 					animate.setDuration(300);
-					animate.setFillAfter(true);
 					fab.startAnimation(animate);
 					scrollDiff = 0;
 				} else {