diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
index fdef7d1128..261e9ad222 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
@@ -397,7 +397,7 @@ class ChaptersPresenter(
      * Whether downloaded only mode is enabled.
      */
     fun forceDownloaded(): Boolean {
-        return preferences.downloadedOnly().get()
+        return manga.favorite && preferences.downloadedOnly().get()
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
index 7be87b07c1..457220789d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
@@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.util.preference.iconTint
 import eu.kanade.tachiyomi.util.preference.onClick
 import eu.kanade.tachiyomi.util.preference.preference
 import eu.kanade.tachiyomi.util.preference.preferenceCategory
+import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.getResourceColor
@@ -30,6 +31,7 @@ class MoreController : SettingsController(), RootController {
         switchPreference {
             key = Keys.downloadedOnly
             titleRes = R.string.label_downloaded_only
+            summaryRes = R.string.downloaded_only_summary
             iconRes = R.drawable.ic_cloud_off_24dp
             iconTint = tintColor
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96212b137f..659bb9bc54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
 
     <!-- Activities and fragments labels (toolbar title) -->
     <string name="label_more">More</string>
-    <string name="label_downloaded_only">Downloaded only</string>
     <string name="label_settings">Settings</string>
     <string name="label_download_queue">Download queue</string>
     <string name="label_library">Library</string>
@@ -305,7 +304,7 @@
     <string name="pref_auto_update_manga_sync">Sync chapters after reading</string>
     <string name="services">Services</string>
 
-    <!-- Backup section -->
+      <!-- Backup section -->
     <string name="backup">Backup</string>
     <string name="pref_create_backup">Create backup</string>
     <string name="pref_create_backup_summ">Can be used to restore current library</string>
@@ -364,6 +363,11 @@
     <string name="pref_acra_summary">Helps fix any bugs. No sensitive data will be sent</string>
 
 
+    <!-- More -->
+    <string name="label_downloaded_only">Downloaded only</string>
+    <string name="downloaded_only_summary">Filters all manga in your library</string>
+
+
     <!-- Login dialog -->
     <string name="login_title">Log in to %1$s</string>
     <string name="username">Username</string>