diff --git a/amnet-native/app/CardAddModal.tsx b/amnet-native/app/CardAddModal.tsx
index d90c54a..a6e103c 100644
--- a/amnet-native/app/CardAddModal.tsx
+++ b/amnet-native/app/CardAddModal.tsx
@@ -1,4 +1,4 @@
-import {useCallback, useEffect, useState} from "react";
+import {useCallback, useLayoutEffect, useState} from "react";
 import {TextInput, TouchableOpacity, View} from "react-native";
 import {Button, Card, Divider, Paragraph, useTheme} from "react-native-paper";
 import {useModalStyles} from "../utils/ModalStyles";
@@ -35,7 +35,7 @@ export default function CardAddModal({navigation}) {
     }, [realm]);
 
     // header effects
-    useEffect(() => {
+    useLayoutEffect(() => {
         navigation.setOptions({
             headerLeft: () => <TouchableOpacity onPress={() => navigation.goBack()}>
                 <Paragraph style={modalStyles.headerText}>Cancel</Paragraph>
@@ -43,7 +43,7 @@ export default function CardAddModal({navigation}) {
         });
     }, [navigation, modalStyles]);
 
-    useEffect(() => {
+    useLayoutEffect(() => {
         const canSave = cardName.length && cardNumber.length === 20;
         const themeOptions = canSave ? modalStyles.headerText : {color: theme.colors.outline};
 
diff --git a/amnet-native/app/ServerAddModal.tsx b/amnet-native/app/ServerAddModal.tsx
index dd720ef..75fb71b 100644
--- a/amnet-native/app/ServerAddModal.tsx
+++ b/amnet-native/app/ServerAddModal.tsx
@@ -1,4 +1,4 @@
-import {useCallback, useEffect, useState} from "react";
+import {useCallback, useLayoutEffect, useState} from "react";
 import {Card, Paragraph, useTheme} from "react-native-paper";
 import {TextInput, TouchableOpacity, View} from "react-native";
 import {useModalStyles} from "../utils/ModalStyles";
@@ -15,7 +15,7 @@ export default function ServerAddModal({navigation}) {
 
     const [serverAddress, setServerAddress] = useState('');
 
-    useEffect(() => {
+    useLayoutEffect(() => {
         navigation.setOptions({
             headerLeft: () => <TouchableOpacity onPress={() => navigation.goBack()}>
                 <Paragraph style={modalStyles.headerText}>Cancel</Paragraph>
@@ -23,7 +23,7 @@ export default function ServerAddModal({navigation}) {
         });
     }, [navigation, modalStyles]);
 
-    useEffect(() => {
+    useLayoutEffect(() => {
         let urlValid = false;
 
         try {
diff --git a/amnet-native/app/ServerManager.tsx b/amnet-native/app/ServerManager.tsx
index bd538d8..06aae47 100644
--- a/amnet-native/app/ServerManager.tsx
+++ b/amnet-native/app/ServerManager.tsx
@@ -1,7 +1,7 @@
 import {Paragraph} from "react-native-paper";
-import React, {ReactEventHandler, useCallback, useEffect, useMemo, useState} from "react";
-import {FlatList, NativeSyntheticEvent, NativeUIEvent, Text, View} from "react-native";
 import {Globe, History, ServerOff} from "lucide-react-native";
+import {FlatList, NativeSyntheticEvent, Text, View} from "react-native";
+import React, {useCallback, useLayoutEffect, useMemo, useState} from "react";
 import {EmptyStatePlaceholder} from "../components/EmptyStatePlaceholder";
 import {AMUICard, AMUICardDetail} from "../components/AMUICard";
 import TimeAgo from "../components/TimeAgo";
@@ -72,7 +72,7 @@ export default function ServerManager({navigation}) {
     }, [query, searchQuery]);
 
     // enable searchbar
-    useEffect(() => {
+    useLayoutEffect(() => {
         navigation.setOptions({
             headerSearchBarOptions: {
                 type: "text",