diff --git a/CHANGELOG.md b/CHANGELOG.md
index a43462eb..f49f0cb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 - Allow creating nested directories directly
 - I keep saying this but for real: error message for wrong SSH/HTTPS password is properly fixed now
 - Correctly hide TOTP import button when TOTP secret/OTPAUTH URL is already present in extra content
+- SMS OTP Autofill no longer crashes when invoked and correctly asks for the required permission on first use
 
 ## [1.10.1] - 2020-07-23
 
diff --git a/app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
index 02394867..4413ea10 100644
--- a/app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
+++ b/app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
@@ -24,13 +24,30 @@ import com.google.android.gms.auth.api.phone.SmsRetriever
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.api.ResolvableApiException
-import com.google.android.gms.tasks.Tasks
+import com.google.android.gms.tasks.Task
 import com.zeapo.pwdstore.autofill.oreo.AutofillAction
 import com.zeapo.pwdstore.autofill.oreo.Credentials
 import com.zeapo.pwdstore.autofill.oreo.FillableForm
 import com.zeapo.pwdstore.databinding.ActivityOreoAutofillSmsBinding
 import com.zeapo.pwdstore.utils.viewBinding
+import java.util.concurrent.ExecutionException
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+suspend fun <T> Task<T>.suspendableAwait() = suspendCoroutine<T> { cont ->
+    addOnSuccessListener { result: T ->
+        cont.resume(result)
+    }
+    addOnFailureListener { e ->
+        // Unwrap specific exceptions (e.g. ResolvableApiException) from ExecutionException.
+        val cause = (e as? ExecutionException)?.cause ?: e
+        cont.resumeWithException(cause)
+    }
+}
 
 @RequiresApi(Build.VERSION_CODES.O)
 class AutofillSmsActivity : AppCompatActivity() {
@@ -105,15 +122,21 @@ class AutofillSmsActivity : AppCompatActivity() {
         }
     }
 
-    private fun waitForSms() {
+    private suspend fun waitForSms() {
         val smsClient = SmsCodeRetriever.getAutofillClient(this@AutofillSmsActivity)
         try {
-            Tasks.await(smsClient.startSmsCodeRetriever())
+            withContext(Dispatchers.IO) {
+                smsClient.startSmsCodeRetriever().suspendableAwait()
+            }
         } catch (e: ResolvableApiException) {
-            e.startResolutionForResult(this, 1)
+            withContext(Dispatchers.Main) {
+                e.startResolutionForResult(this@AutofillSmsActivity, 1)
+            }
         } catch (e: Exception) {
             e(e)
-            finish()
+            withContext(Dispatchers.Main) {
+                finish()
+            }
         }
     }