diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index fd2e15b73..24e0c4020 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -703,7 +703,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         NotificationHelper.createNotificationChannelsForAccount(accountManager.activeAccount!!, this)
 
         // Setup push notifications
-        showMigrationNoticeIfNecessary(this, binding.root, accountManager)
+        showMigrationNoticeIfNecessary(this, binding.mainCoordinatorLayout, binding.composeButton, accountManager)
         if (NotificationHelper.areNotificationsEnabled(this, accountManager)) {
             lifecycleScope.launch {
                 enablePushNotificationsWithFallback(this@MainActivity, mastodonApi, accountManager)
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/PushNotificationHelper.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/PushNotificationHelper.kt
index f1b714301..68a443027 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/PushNotificationHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/PushNotificationHelper.kt
@@ -51,7 +51,12 @@ private fun accountNeedsMigration(account: AccountEntity): Boolean =
 fun currentAccountNeedsMigration(accountManager: AccountManager): Boolean =
     accountManager.activeAccount?.let(::accountNeedsMigration) ?: false
 
-fun showMigrationNoticeIfNecessary(context: Context, parent: View, accountManager: AccountManager) {
+fun showMigrationNoticeIfNecessary(
+    context: Context,
+    parent: View,
+    anchorView: View?,
+    accountManager: AccountManager
+) {
     // No point showing anything if we cannot enable it
     if (!isUnifiedPushAvailable(context)) return
     if (!anyAccountNeedsMigration(accountManager)) return
@@ -59,10 +64,10 @@ fun showMigrationNoticeIfNecessary(context: Context, parent: View, accountManage
     val pm = PreferenceManager.getDefaultSharedPreferences(context)
     if (pm.getBoolean(KEY_MIGRATION_NOTICE_DISMISSED, false)) return
 
-    Snackbar.make(parent, R.string.tips_push_notification_migration, Snackbar.LENGTH_INDEFINITE).apply {
-        setAction(R.string.action_details) { showMigrationExplanationDialog(context, accountManager) }
-        show()
-    }
+    Snackbar.make(parent, R.string.tips_push_notification_migration, Snackbar.LENGTH_INDEFINITE)
+        .setAnchorView(anchorView)
+        .setAction(R.string.action_details) { showMigrationExplanationDialog(context, accountManager) }
+        .show()
 }
 
 private fun showMigrationExplanationDialog(context: Context, accountManager: AccountManager) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2f8777092..cc9f95704 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,7 @@
     android:fitsSystemWindows="true">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/mainCoordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context="com.keylesspalace.tusky.MainActivity">