diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt
index 49fb739372..7465e1a912 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt
@@ -36,7 +36,7 @@ class BrowseSourceItem(
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): BrowseSourceHolder {
         val parent = adapter.recyclerView
-        return if (parent is AutofitRecyclerView) {
+        return if (parent is AutofitRecyclerView && !catalogueAsList.getOrDefault()) {
             val listType = catalogueListType.getOrDefault()
             view.apply {
                 val coverHeight = (parent.itemWidth / 3 * 4f).toInt()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
index 6740b2eb00..6c6584ea1c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
@@ -101,10 +101,10 @@ fun Controller.scrollViewWith(
         } else if (recycler.translationY == 0f) {
             elevationAnim?.cancel()
             elevationAnim = ValueAnimator.ofFloat(
-                activity!!.appbar.elevation, if (el) 15f else 0f
+                activity?.appbar?.elevation ?: 0f, if (el) 15f else 0f
             )
             elevationAnim?.addUpdateListener { valueAnimator ->
-                activity!!.appbar.elevation = valueAnimator.animatedValue as Float
+                activity?.appbar?.elevation = valueAnimator.animatedValue as Float
             }
             elevationAnim?.start()
         }