diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index 3ad05edac..39c75c53a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -115,10 +115,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
         // Obtain information to fill out the profile.
         viewModel.setAccountInfo(intent.getStringExtra(KEY_ACCOUNT_ID))
 
-        if (viewModel.isSelf) {
-            updateButtons()
-        }
-
         val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
         animateAvatar = sharedPrefs.getBoolean("animateGifAvatars", false)
         hideFab = sharedPrefs.getBoolean("fabHide", false)
@@ -129,6 +125,10 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
         setupAccountViews()
         setupRefreshLayout()
         subscribeObservables()
+
+        if (viewModel.isSelf) {
+            updateButtons()
+        }
     }
 
     /**