diff --git a/package.json b/package.json
index f0f6f03..d3aa6fd 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "react-native": "0.70.6",
     "react-native-currency-input": "^1.1.0",
     "react-native-dropdown-picker": "^5.4.3",
+    "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-localize": "^2.2.4",
     "react-native-maps": "^1.3.2",
     "react-native-modal": "^13.0.1",
diff --git a/src/scenes/Login/index.js b/src/scenes/Login/index.js
index 9be02f1..f184b4b 100644
--- a/src/scenes/Login/index.js
+++ b/src/scenes/Login/index.js
@@ -42,26 +42,26 @@ const Login = ({route, navigation}) => {
   return (
     <Container backgroundColor={Colors.WHITE}>
       <View style={styles.container}>
-        <TouchableOpacity
-          onPress={() => setModalLanguage(true)}
-          style={styles.translateButton}>
-          <Icon
-            name="translate"
-            type="MaterialCommunityIcons"
-            style={styles.translateButtonIcon}
-          />
-          <Image
-            source={
-              i18n.language === 'id'
-                ? require('assets/images/indonesia-flag.png')
-                : require('assets/images/english-flag.png')
-            }
-            style={styles.translateButtonImage}
-          />
-        </TouchableOpacity>
         <KeyboardAvoidingView
           style={{flex: 1}}
           behavior={Platform.OS === 'ios' ? 'height' : undefined}>
+          <TouchableOpacity
+            onPress={() => setModalLanguage(true)}
+            style={styles.translateButton}>
+            <Icon
+              name="translate"
+              type="MaterialCommunityIcons"
+              style={styles.translateButtonIcon}
+            />
+            <Image
+              source={
+                i18n.language === 'id'
+                  ? require('assets/images/indonesia-flag.png')
+                  : require('assets/images/english-flag.png')
+              }
+              style={styles.translateButtonImage}
+            />
+          </TouchableOpacity>
           <View style={styles.boardingSection}>
             <Image
               source={require('assets/images/chef-pana.png')}
diff --git a/src/scenes/Register/index.js b/src/scenes/Register/index.js
index 5caf292..e55aa49 100644
--- a/src/scenes/Register/index.js
+++ b/src/scenes/Register/index.js
@@ -1,16 +1,18 @@
 import React from 'react';
-import {View, Text, ScrollView} from 'react-native';
+import {View, Text, ScrollView, KeyboardAvoidingView} from 'react-native';
 import {Container, Header, Input, Button} from 'components';
 import {Colors} from 'global-styles';
 import styles from './styles';
 import {useTranslation} from 'react-i18next';
+import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view';
+
 const Register = ({navigation}) => {
   const {t} = useTranslation();
   return (
     <Container backgroundColor={Colors.WHITE}>
       <Header navigation={navigation} smTitle={t('partner_with_us_text')} />
       <View style={styles.container}>
-        <ScrollView>
+        <KeyboardAwareScrollView keyboardOpeningTime={0}>
           <View style={styles.infoSection}>
             <Text style={styles.title}>{t('register_merchant_title')}</Text>
             <Text style={styles.subTitle}>
@@ -34,7 +36,7 @@ const Register = ({navigation}) => {
             label={t('email_business_owner_text')}
             note={t('email_business_owner_note')}
           />
-        </ScrollView>
+        </KeyboardAwareScrollView>
         <Button
           title={t('join_as_a_partner_text')}
           onPress={() => navigation.navigate('BusinessProfileRegistration')}
diff --git a/yarn.lock b/yarn.lock
index b07521e..987c28f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5775,11 +5775,19 @@ react-native-gradle-plugin@^0.70.3:
   resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.70.3.tgz#cbcf0619cbfbddaa9128701aa2d7b4145f9c4fc8"
   integrity sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A==
 
-react-native-iphone-x-helper@^1.3.1:
+react-native-iphone-x-helper@^1.0.3, react-native-iphone-x-helper@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
   integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==
 
+react-native-keyboard-aware-scroll-view@^0.9.5:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.5.tgz#e2e9665d320c188e6b1f22f151b94eb358bf9b71"
+  integrity sha512-XwfRn+T/qBH9WjTWIBiJD2hPWg0yJvtaEw6RtPCa5/PYHabzBaWxYBOl0usXN/368BL1XktnZPh8C2lmTpOREA==
+  dependencies:
+    prop-types "^15.6.2"
+    react-native-iphone-x-helper "^1.0.3"
+
 react-native-localize@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/react-native-localize/-/react-native-localize-2.2.4.tgz#3bc46ade48499ab9df61bf17a9b66633a5ba9bb9"