diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index b10470b..d67d6d6 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -242,9 +242,8 @@
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-
         if (DOWNLOAD_PATH == requestCode) {
-            if (resultCode == Activity.RESULT_OK && intent != null) {
+            if (resultCode != Activity.RESULT_CANCELED && intent != null) {
                 downloadPath = intent.getStringExtra("result_dir_sel");
                 // Fallback logic to stock browser
                 if (downloadPath == null) {
diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
index e6f2f1c..256fe32 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -123,7 +123,7 @@
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == DOWNLOAD_PATH_RESULT_CODE) {
-            if (resultCode == Activity.RESULT_OK && data != null) {
+            if ( resultCode != Activity.RESULT_CANCELED && data != null) {
                 String downloadPath = data.getStringExtra("result_dir_sel");
                 // Fallback logic to stock browser
                 if (downloadPath == null) {