diff --git a/app/screens/navigation.ts b/app/screens/navigation.ts
index ffbf1c29c..0812ca038 100644
--- a/app/screens/navigation.ts
+++ b/app/screens/navigation.ts
@@ -499,6 +499,11 @@ export function goToScreen(name: AvailableScreens, title: string, passProps = {}
 
     DeviceEventEmitter.emit(Events.TAB_BAR_VISIBLE, false);
 
+    if (NavigationStore.getScreensInStack().includes(name)) {
+        Navigation.updateProps(name, passProps);
+        return Navigation.popTo(name, merge(defaultOptions, options));
+    }
+
     return Navigation.push(componentId, {
         component: {
             id: name,
diff --git a/app/utils/helpers.ts b/app/utils/helpers.ts
index 516ed279a..83b57dee7 100644
--- a/app/utils/helpers.ts
+++ b/app/utils/helpers.ts
@@ -135,6 +135,9 @@ export function getRoundedTime(value: Moment) {
 
 export function isTablet() {
     const result: SplitViewResult = RNUtils.isRunningInSplitView();
+    if (!result) {
+        return false;
+    }
     return result.isTablet && !result.isSplit;
 }