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 ed5094d5b..c23c42c46 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -894,8 +894,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
 		}
 
-		if (GlobalUserPreferences.enableFabAutoHide) {
+		if(GlobalUserPreferences.enableFabAutoHide){
 			int dy = scrollY - oldScrollY;
+
 			if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
 				TranslateAnimation animate = new TranslateAnimation(
 						0,
@@ -903,12 +904,11 @@ 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;
 			} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-				if (v.getScrollY() == 0 || scrollDiff > 400) {
+				if (scrollDiff > 400) {
 					fab.setVisibility(View.VISIBLE);
 					TranslateAnimation animate = new TranslateAnimation(
 							0,
@@ -916,7 +916,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 							fab.getHeight() * 2,
 							0);
 					animate.setDuration(300);
-					animate.setFillAfter(true);
 					fab.startAnimation(animate);
 					scrollDiff = 0;
 				} else {