diff --git a/src/screens/Compose.tsx b/src/screens/Compose.tsx
index ffd54a24..6b3d6f4d 100644
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@@ -343,8 +343,7 @@ const ScreenCompose: React.FC<ScreenComposeProp> = ({
   return (
     <KeyboardAvoidingView
       style={styles.base}
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      keyboardVerticalOffset={Platform.OS === 'android' ? 30 : 0}
+      behavior={Platform.OS === 'ios' ? 'padding' : undefined}
     >
       <SafeAreaView
         style={styles.base}
diff --git a/src/screens/Compose/DraftsList/Root.tsx b/src/screens/Compose/DraftsList/Root.tsx
index 8d60c401..a30dd6e6 100644
--- a/src/screens/Compose/DraftsList/Root.tsx
+++ b/src/screens/Compose/DraftsList/Root.tsx
@@ -9,11 +9,12 @@ import {
 } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback, useContext, useState } from 'react'
+import React, { useCallback, useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   Dimensions,
   Modal,
+  Platform,
   Pressable,
   StyleSheet,
   Text,
@@ -41,6 +42,12 @@ const ComposeDraftsListRoot: React.FC<Props> = ({ timestamp }) => {
     draft => draft.timestamp !== timestamp
   )
 
+  useEffect(() => {
+    if (instanceDrafts?.length === 0) {
+      navigation.goBack()
+    }
+  }, [instanceDrafts?.length])
+
   const actionWidth =
     StyleConstants.Font.Size.L + StyleConstants.Spacing.Global.PagePadding * 4
 
@@ -156,18 +163,18 @@ const ComposeDraftsListRoot: React.FC<Props> = ({ timestamp }) => {
 
   return (
     <>
-      <PanGestureHandler enabled={true}>
+      <PanGestureHandler enabled={Platform.OS === 'ios'}>
         <SwipeListView
           data={instanceDrafts}
           renderItem={renderItem}
           renderHiddenItem={renderHiddenItem}
           disableRightSwipe={true}
           rightOpenValue={-actionWidth}
-          previewRowKey={
-            instanceDrafts?.length
-              ? instanceDrafts[0].timestamp.toString()
-              : undefined
-          }
+          // previewRowKey={
+          //   instanceDrafts?.length
+          //     ? instanceDrafts[0].timestamp.toString()
+          //     : undefined
+          // }
           // previewDuration={350}
           previewOpenValue={-actionWidth / 2}
           ItemSeparatorComponent={ComponentSeparator}