diff --git a/app/build.gradle b/app/build.gradle
index aef248f10..bb84572a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -192,7 +192,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc"
 
     // rate this app
-    implementation 'com.suddenh4x.ratingdialog:awesome-app-rating:2.4.0'
+    googleImplementation 'com.suddenh4x.ratingdialog:awesome-app-rating:2.4.0'
 
     // Coroutines
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
diff --git a/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt b/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
index 36001776e..96894333a 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.provider.Settings
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import com.geeksville.mesh.analytics.AnalyticsProvider
 
@@ -71,6 +72,10 @@ open class GeeksvilleApplication : Application(), Logging {
             analytics.setEnabled(value && !isInTestLab) // Never do analytics in the test lab
         }
 
+    fun askToRate(activity: AppCompatActivity) {
+        // do nothing
+    }
+
     override fun onCreate() {
         super.onCreate()
 
diff --git a/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt b/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
index 0b34f9f64..8966ac8ae 100644
--- a/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
+++ b/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
@@ -6,11 +6,13 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.provider.Settings
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import com.geeksville.mesh.analytics.AnalyticsProvider
+import com.geeksville.mesh.util.exceptionReporter
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailabilityLight
-
+import com.suddenh4x.ratingdialog.AppRating
 
 fun isGooglePlayAvailable(context: Context): Boolean {
     val a = GoogleApiAvailabilityLight.getInstance()
@@ -82,6 +84,19 @@ open class GeeksvilleApplication : Application(), Logging {
             analytics.setEnabled(value && !isInTestLab) // Never do analytics in the test lab
         }
 
+    /** Ask user to rate in play store */
+    fun askToRate(activity: AppCompatActivity) {
+        if (!isGooglePlayAvailable(this)) return
+        exceptionReporter { // we don't want to crash our app because of bugs in this optional feature
+            AppRating.Builder(activity)
+                .setMinimumLaunchTimes(10) // default is 5, 3 means app is launched 3 or more times
+                .setMinimumDays(10) // default is 5, 0 means install day, 10 means app is launched 10 or more days later than installation
+                .setMinimumLaunchTimesToShowAgain(5) // default is 5, 1 means app is launched 1 or more times after neutral button clicked
+                .setMinimumDaysToShowAgain(14) // default is 14, 1 means app is launched 1 or more days after neutral button clicked
+                .showIfMeetsConditions()
+        }
+    }
+
     override fun onCreate() {
         super.onCreate()
 
diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 0eba6012a..3ef2ac25b 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -48,7 +48,6 @@ import com.geeksville.mesh.util.exceptionReporter
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayoutMediator
-import com.suddenh4x.ratingdialog.AppRating
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -178,18 +177,6 @@ class MainActivity : AppCompatActivity(), Logging {
         }
     }
 
-    /// Ask user to rate in play store
-    private fun askToRate() {
-        exceptionReporter { // we don't want to crash our app because of bugs in this optional feature
-            AppRating.Builder(this)
-                .setMinimumLaunchTimes(10) // default is 5, 3 means app is launched 3 or more times
-                .setMinimumDays(10) // default is 5, 0 means install day, 10 means app is launched 10 or more days later than installation
-                .setMinimumLaunchTimesToShowAgain(5) // default is 5, 1 means app is launched 1 or more times after neutral button clicked
-                .setMinimumDaysToShowAgain(14) // default is 14, 1 means app is launched 1 or more days after neutral button clicked
-                .showIfMeetsConditions()
-        }
-    }
-
     private val isInTestLab: Boolean by lazy {
         (application as GeeksvilleApplication).isInTestLab
     }
@@ -199,14 +186,19 @@ class MainActivity : AppCompatActivity(), Logging {
         super.onCreate(savedInstanceState)
 
         val prefs = UIViewModel.getPreferences(this)
-        if (!prefs.getBoolean("app_intro_completed", false)) {
-            startActivity(Intent(this, AppIntroduction::class.java))
+        if (savedInstanceState == null) {
+            // First run: show AppIntroduction
+            if (!prefs.getBoolean("app_intro_completed", false)) {
+                startActivity(Intent(this, AppIntroduction::class.java))
+            }
+            // First run: migrate in-app language prefs to appcompat
+            prefs.getString("lang", LanguageUtils.SYSTEM_DEFAULT).let {
+                if (it != LanguageUtils.SYSTEM_MANAGED) LanguageUtils.migrateLanguagePrefs(prefs)
+            }
+            info("in-app language is ${LanguageUtils.getLocale()}")
+            // Ask user to rate in play store
+            (application as GeeksvilleApplication).askToRate(this)
         }
-        // First run: migrate in-app language prefs to appcompat
-        if (prefs.getString("lang", LanguageUtils.SYSTEM_DEFAULT) != LanguageUtils.SYSTEM_MANAGED) {
-            LanguageUtils.migrateLanguagePrefs(prefs)
-        }
-        info("in-app language is ${LanguageUtils.getLocale()}")
 
         binding = ActivityMainBinding.inflate(layoutInflater)
 
@@ -231,8 +223,6 @@ class MainActivity : AppCompatActivity(), Logging {
 
         // Handle any intent
         handleIntent(intent)
-
-        if (isGooglePlayAvailable(this)) askToRate()
     }
 
     private fun initToolbar() {