diff --git a/lib/screens/components/ComicList.dart b/lib/screens/components/ComicList.dart
index e42eeb3..1cd89dd 100644
--- a/lib/screens/components/ComicList.dart
+++ b/lib/screens/components/ComicList.dart
@@ -61,19 +61,24 @@ class _ComicListState extends State<ComicList> {
       physics: const AlwaysScrollableScrollPhysics(),
       children: [
         ...widget.comicList.map((e) {
-          var shadow = e.categories.map(
-            (c) {
-              switch (currentShadowCategoriesMode()) {
-                case ShadowCategoriesMode.BLACK_LIST:
-                  if (shadowCategories.contains(c)) return true;
-                  break;
-                case ShadowCategoriesMode.WHITE_LIST:
-                  if (!shadowCategories.contains(c)) return true;
-                  break;
+          late bool shadow;
+          X:
+          switch (currentShadowCategoriesMode()) {
+            case ShadowCategoriesMode.BLACK_LIST:
+              shadow = e.categories
+                  .map((c) => shadowCategories.contains(c))
+                  .reduce((value, element) => value || element);
+              break;
+            case ShadowCategoriesMode.WHITE_LIST:
+              for (var c in e.categories) {
+                if (shadowCategories.contains(c)) {
+                  shadow = false;
+                  break X;
+                }
               }
-              return false;
-            },
-          ).reduce((value, element) => value || element);
+              shadow = true;
+              break;
+          }
           if (shadow) {
             return InkWell(
               onTap: () {},
diff --git a/lib/screens/components/ImageReader.dart b/lib/screens/components/ImageReader.dart
index e36321d..e2f8b19 100644
--- a/lib/screens/components/ImageReader.dart
+++ b/lib/screens/components/ImageReader.dart
@@ -1533,7 +1533,8 @@ class _GalleryReaderState extends _ImageReaderContentState {
   }
 
   Widget _buildNextEpController() {
-    if (_current < widget.struct.images.length - 1) return Container();
+    if (super._fullscreenController() ||
+        _current < widget.struct.images.length - 1) return Container();
     return Align(
       alignment: Alignment.bottomRight,
       child: Material(