diff --git a/.gitignore b/.gitignore
index f9b556852..83d5a2959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ captures
 fastlane/metadata/android/*/changelogs/
 /Habitica/amazon
 /fastlane/Fastfile.bkp
+/fastlane/Fastfile
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 1afb2b14a..35be96c27 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -148,7 +148,7 @@ android {
         buildConfigField "String", "STORE", "\"google\""
         multiDexEnabled true
 
-        versionCode 2051
+        versionCode 2053
         versionName "1.7"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
index 3ae359750..2c4bf8428 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
@@ -208,7 +208,7 @@ class GiftIAPActivity: BaseActivity() {
 
     private fun selectSubscription(sku: Sku) {
         for (thisSku in skus) {
-            buttonForSku(sku)?.setIsPurchased(false)
+            buttonForSku(thisSku)?.setIsPurchased(false)
         }
         this.selectedSubscriptionSku = sku
         val subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku)
@@ -243,20 +243,18 @@ class GiftIAPActivity: BaseActivity() {
     @Subscribe
     public fun onConsumablePurchased(event: ConsumablePurchasedEvent) {
         consumePurchase(event.purchase)
-        displayConfirmationDialog()
-        finish()
+        runOnUiThread {
+            displayConfirmationDialog()
+        }
     }
 
     private fun displayConfirmationDialog() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            AlertDialog.Builder(this, android.R.style.Theme_Material_Dialog_Alert)
-        } else {
-            AlertDialog.Builder(this)
-        }
+        AlertDialog.Builder(this)
                 .setTitle(R.string.gift_confirmation_title)
                 .setMessage(if (remoteConfigManager.enableGiftOneGetOne()) R.string.gift_confirmation_text_g1g1 else R.string.gift_confirmation_text)
                 .setPositiveButton(android.R.string.ok) { dialog, _ ->
                     dialog.dismiss()
+                    finish()
                 }
                 .show()
     }