diff --git a/src/view/com/util/Views.jsx b/src/view/com/util/Views.jsx
index 2984a2d2d1..02a2b407ee 100644
--- a/src/view/com/util/Views.jsx
+++ b/src/view/com/util/Views.jsx
@@ -1,12 +1,7 @@
-import React from 'react'
 import {View} from 'react-native'
 import Animated from 'react-native-reanimated'
 
+// If you explode these into functions, don't forget to forwardRef!
 export const FlatList_INTERNAL = Animated.FlatList
-export function CenteredView(props) {
-  return <View {...props} />
-}
-
-export function ScrollView(props) {
-  return <Animated.ScrollView {...props} />
-}
+export const CenteredView = View
+export const ScrollView = Animated.ScrollView
diff --git a/src/view/com/util/Views.web.tsx b/src/view/com/util/Views.web.tsx
index 792ace140e..0ebd986cbb 100644
--- a/src/view/com/util/Views.web.tsx
+++ b/src/view/com/util/Views.web.tsx
@@ -31,7 +31,7 @@ interface AddedProps {
   desktopFixedHeight?: boolean | number
 }
 
-export function CenteredView({
+export const CenteredView = React.forwardRef(function CenteredView({
   style,
   sideBorders,
   topBorder,
@@ -58,7 +58,7 @@ export function CenteredView({
     style = addStyle(style, pal.border)
   }
   return <View style={style} {...props} />
-}
+})
 
 export const FlatList_INTERNAL = React.forwardRef(function FlatListImpl<ItemT>(
   {