diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81cac0a29..c4e43b232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+-   Cancelling the Autofill "Generate password" action now correctly returns you to the original app.
+
 ## [1.13.1] - 2020-10-23
 
 ### Fixed
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
index f4c296ee4..bc012d3d0 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
@@ -140,8 +140,10 @@ class AutofillSaveActivity : AppCompatActivity() {
                     Intent()
                 }
                 setResult(RESULT_OK, resultIntent)
-                finish()
+            } else {
+                setResult(RESULT_CANCELED)
             }
+            finish()
         }.launch(saveIntent)
     }
 }