diff --git a/app/src/main/java/org/tasks/billing/PurchaseDialog.kt b/app/src/main/java/org/tasks/billing/PurchaseDialog.kt
index ba6d7cd47..2e98b9b2d 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseDialog.kt
+++ b/app/src/main/java/org/tasks/billing/PurchaseDialog.kt
@@ -75,15 +75,7 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated {
                 .usePlugin(StrikethroughPlugin.create())
                 .build()
 
-        if (BuildConfig.FLAVOR != "generic") {
-            setWaitScreen(true)
-        } else {
-            setWaitScreen(false)
-            binding.payAnnually.isVisible = false
-            binding.payMonthly.isVisible = false
-            binding.payOther.isVisible = false
-            binding.sponsor.isVisible = true
-        }
+        setWaitScreen(BuildConfig.FLAVOR != "generic")
 
         return dialogBuilder.newDialog()
                 .setView(binding.root)
@@ -175,11 +167,13 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated {
 
     private fun setWaitScreen(isWaitScreen: Boolean) {
         Timber.d("setWaitScreen(%s)", isWaitScreen)
+        val generic = BuildConfig.FLAVOR == "generic"
         binding.slider.isVisible = !isWaitScreen && nameYourPrice
         binding.payOther.isVisible = !isWaitScreen
         binding.payOther.setText(if (nameYourPrice) R.string.back else R.string.more_options)
-        binding.tasksOrgButtonPanel.isVisible = !isWaitScreen
-        binding.screenWait.isVisible = isWaitScreen
+        binding.tasksOrgButtonPanel.isVisible = !isWaitScreen && !generic
+        binding.screenWait.isVisible = isWaitScreen && !generic
+        binding.sponsor.isVisible = generic
         updateText()
     }
 
diff --git a/app/src/main/res/layout/activity_purchase.xml b/app/src/main/res/layout/activity_purchase.xml
index a232b57ea..dafa00506 100644
--- a/app/src/main/res/layout/activity_purchase.xml
+++ b/app/src/main/res/layout/activity_purchase.xml
@@ -103,22 +103,21 @@
               app:layout_constraintTop_toBottomOf="@+id/pay_annually"
               tools:text="@string/back"/>
 
-            <com.google.android.material.button.MaterialButton
-              android:id="@+id/sponsor"
-              style="@style/OutlineButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/github_sponsor"
-              android:textColor="@color/text_secondary"
-              android:visibility="gone"
-              app:icon="@drawable/ic_outline_favorite_border_24px"
-              app:iconTint="@color/github_sponsor"
-              app:layout_constraintEnd_toEndOf="parent"
-              app:layout_constraintStart_toStartOf="parent"
-              app:layout_constraintTop_toBottomOf="@+id/pay_annually"/>
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <com.google.android.material.button.MaterialButton
+          android:id="@+id/sponsor"
+          style="@style/OutlineButton"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_horizontal"
+          android:text="@string/github_sponsor"
+          android:textColor="@color/text_secondary"
+          android:visibility="gone"
+          tools:visibility="visible"
+          app:icon="@drawable/ic_outline_favorite_border_24px"
+          app:iconTint="@color/github_sponsor"/>
+
     </LinearLayout>
 
 </RelativeLayout>