diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 77b9f3083..a882acf3b 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -64,15 +64,17 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
                 || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             prefUseSaf.setEnabled(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                prefUseSaf.setSummary(R.string.downloads_storage_use_saf_summary_api_29);
+            } else {
+                prefUseSaf.setSummary(R.string.downloads_storage_use_saf_summary_api_19);
+            }
+            prefStorageAsk.setSummary(R.string.downloads_storage_ask_summary_no_saf_notice);
         }
 
         updatePreferencesSummary();
         updatePathPickers(!defaultPreferences.getBoolean(downloadStorageAsk, false));
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            prefStorageAsk.setSummary(R.string.downloads_storage_ask_summary);
-        }
-
         if (hasInvalidPath(downloadPathVideoPreference)
                 || hasInvalidPath(downloadPathAudioPreference)) {
             updatePreferencesSummary();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31e03fad6..4be0519c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -641,10 +641,12 @@
     <string name="start_downloads">Start downloads</string>
     <string name="pause_downloads">Pause downloads</string>
     <string name="downloads_storage_ask_title">Ask where to download</string>
-    <string name="downloads_storage_ask_summary">You will be asked where to save each download</string>
-    <string name="downloads_storage_ask_summary_kitkat">You will be asked where to save each download.\nChoose SAF if you want to download to an external SD card</string>
-    <string name="downloads_storage_use_saf_title">Use SAF</string>
-    <string name="downloads_storage_use_saf_summary">The \'Storage Access Framework\' allows downloads to an external SD card.\nSome devices are incompatible</string>
+    <string name="downloads_storage_ask_summary">You will be asked where to save each download.\nEnable the system folder picker (SAF) if you want to download to an external SD card</string>
+    <string name="downloads_storage_ask_summary_no_saf_notice">You will be asked where to save each download</string>
+    <string name="downloads_storage_use_saf_title">Use system folder picker (SAF)</string>
+    <string name="downloads_storage_use_saf_summary">The \'Storage Access Framework\' allows downloads to an external SD card</string>
+    <string name="downloads_storage_use_saf_summary_api_19">The \'Storage Access Framework\' is not supported on Android KitKat and below</string>
+    <string name="downloads_storage_use_saf_summary_api_29">Starting from Android 10 only \'Storage Access Framework\' is supported</string>
     <string name="choose_instance_prompt">Choose an instance</string>
     <string name="app_language_title">App language</string>
     <string name="systems_language">System default</string>
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index 53f9b2c89..0912f546f 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -3,10 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_category_downloads_title">
 
-    <CheckBoxPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="@string/downloads_storage_ask"
-        android:summary="@string/downloads_storage_ask_summary_kitkat"
+        android:summary="@string/downloads_storage_ask_summary"
         android:title="@string/downloads_storage_ask_title"
         app:iconSpaceReserved="false" />