diff --git a/src/components/Instance.tsx b/src/components/Instance.tsx
index 16722729..c880c972 100644
--- a/src/components/Instance.tsx
+++ b/src/components/Instance.tsx
@@ -35,7 +35,7 @@ const ComponentInstance: React.FC<Props> = ({
   goBack = false
 }) => {
   const { t } = useTranslation('componentInstance')
-  const { theme } = useTheme()
+  const { mode, theme } = useTheme()
 
   const instances = useSelector(getInstances, () => true)
   const [domain, setDomain] = useState<string>()
@@ -158,6 +158,7 @@ const ComponentInstance: React.FC<Props> = ({
             placeholder={t('server.textInput.placeholder')}
             placeholderTextColor={theme.secondary}
             returnKeyType='go'
+            keyboardAppearance={mode}
           />
           <Button
             type='text'
diff --git a/src/screens/Compose/EditAttachment/Root.tsx b/src/screens/Compose/EditAttachment/Root.tsx
index 782ea96b..ba5d71ec 100644
--- a/src/screens/Compose/EditAttachment/Root.tsx
+++ b/src/screens/Compose/EditAttachment/Root.tsx
@@ -25,7 +25,7 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({
   setAltText
 }) => {
   const { t } = useTranslation('sharedCompose')
-  const { theme } = useTheme()
+  const { mode, theme } = useTheme()
   const { composeState } = useContext(ComposeContext)
   const theAttachment = composeState.attachments.uploads[index].remote
 
@@ -79,6 +79,7 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({
           placeholderTextColor={theme.secondary}
           scrollEnabled
           value={altText}
+          keyboardAppearance={mode}
         />
         <Text style={[styles.altTextLength, { color: theme.secondary }]}>
           {altText?.length || 0} / 1500
diff --git a/src/screens/Compose/Root/Footer/Poll.tsx b/src/screens/Compose/Root/Footer/Poll.tsx
index 9666295c..0b364cae 100644
--- a/src/screens/Compose/Root/Footer/Poll.tsx
+++ b/src/screens/Compose/Root/Footer/Poll.tsx
@@ -19,7 +19,7 @@ const ComposePoll: React.FC = () => {
     composeDispatch
   } = useContext(ComposeContext)
   const { t } = useTranslation('sharedCompose')
-  const { theme } = useTheme()
+  const { mode, theme } = useTheme()
 
   const [firstRender, setFirstRender] = useState(true)
   useEffect(() => {
@@ -48,6 +48,7 @@ const ComposePoll: React.FC = () => {
                 color={theme.secondary}
               />
               <TextInput
+                keyboardAppearance={mode}
                 {...(i === 0 && firstRender && { autoFocus: true })}
                 style={[
                   styles.textInput,
diff --git a/src/screens/Compose/Root/Header/SpoilerInput.tsx b/src/screens/Compose/Root/Header/SpoilerInput.tsx
index 1cec41ce..512c85c2 100644
--- a/src/screens/Compose/Root/Header/SpoilerInput.tsx
+++ b/src/screens/Compose/Root/Header/SpoilerInput.tsx
@@ -9,10 +9,11 @@ import ComposeContext from '../../utils/createContext'
 const ComposeSpoilerInput: React.FC = () => {
   const { composeState, composeDispatch } = useContext(ComposeContext)
   const { t } = useTranslation('sharedCompose')
-  const { theme } = useTheme()
+  const { mode, theme } = useTheme()
 
   return (
     <TextInput
+      keyboardAppearance={mode}
       style={[
         styles.spoilerInput,
         {
diff --git a/src/screens/Compose/Root/Header/TextInput.tsx b/src/screens/Compose/Root/Header/TextInput.tsx
index e4520339..56c144d2 100644
--- a/src/screens/Compose/Root/Header/TextInput.tsx
+++ b/src/screens/Compose/Root/Header/TextInput.tsx
@@ -9,10 +9,11 @@ import ComposeContext from '../../utils/createContext'
 const ComposeTextInput: React.FC = () => {
   const { composeState, composeDispatch } = useContext(ComposeContext)
   const { t } = useTranslation('sharedCompose')
-  const { theme } = useTheme()
+  const { mode, theme } = useTheme()
 
   return (
     <TextInput
+      keyboardAppearance={mode}
       style={[
         styles.textInput,
         {
diff --git a/src/screens/Tabs/Shared/sharedScreens.tsx b/src/screens/Tabs/Shared/sharedScreens.tsx
index 4cfaffa1..59802026 100644
--- a/src/screens/Tabs/Shared/sharedScreens.tsx
+++ b/src/screens/Tabs/Shared/sharedScreens.tsx
@@ -68,7 +68,7 @@ const sharedScreens = (
     }: NativeStackNavigatorProps) => JSX.Element
   >
 ) => {
-  const { theme } = useTheme()
+  const { mode, theme } = useTheme()
   const { t } = useTranslation()
 
   const [searchTerm, setSearchTerm] = useState<string>()
@@ -178,6 +178,7 @@ const sharedScreens = (
               }
             />
             <TextInput
+              keyboardAppearance={mode}
               style={[
                 styles.textInput,
                 {