diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index 7b22475bc623..a04e9bfc10ec 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -20,10 +20,18 @@ function RigthModalNavigator() {
             <Stack.Screen
                 name="NewGroup"
                 component={ModalStackNavigators.NewGroupModalStackNavigator}
+                options={{
+                    // Disable animation for this screen because it causes an animation glitch when using shortcuts
+                    animationEnabled: false,
+                }}
             />
             <Stack.Screen
                 name="Search"
                 component={ModalStackNavigators.SearchModalStackNavigator}
+                options={{
+                    // Disable animation for this screen because it causes an animation glitch when using shortcuts
+                    animationEnabled: false,
+                }}
             />
             <Stack.Screen
                 name="Details"
diff --git a/src/libs/Navigation/AppNavigator/RHPScreenOptions.js b/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
index 9aa984023f4f..d7448dcf2314 100644
--- a/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
+++ b/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
@@ -3,7 +3,7 @@ import styles from '../../../styles/styles';
 
 const RHPScreenOptions = {
     headerShown: false,
-    animationEnabled: false,
+    animationEnabled: true,
     gestureDirection: 'horizontal',
     cardStyle: styles.navigationScreenCardStyle,
     cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
diff --git a/src/libs/Navigation/linkTo.js b/src/libs/Navigation/linkTo.js
index c86c15c38146..c610ae710992 100644
--- a/src/libs/Navigation/linkTo.js
+++ b/src/libs/Navigation/linkTo.js
@@ -10,21 +10,18 @@ import getStateFromPath from './getStateFromPath';
  *
  * @param {Object} action action generated by getActionFromState
  * @param {Object} state The root state
- * @returns {{minimalAction: Object, targetName: String}} minimal action is the action that we should dispatch and targetName is the name of the target navigator.
- * targetName name is necessary to determine if we are going to use REPLACE for navigating between RHP flows.
+ * @returns {Object} minimalAction minimal action is the action that we should dispatch
  */
 function getMinimalAction(action, state) {
     let currentAction = action;
     let currentState = state;
     let currentTargetKey = null;
-    let targetName = null;
 
     while (currentState.routes[currentState.index].name === currentAction.payload.name) {
         if (!currentState.routes[currentState.index].state) {
             break;
         }
 
-        targetName = currentState.routes[currentState.index].name;
         currentState = currentState.routes[currentState.index].state;
 
         currentTargetKey = currentState.key;
@@ -40,7 +37,7 @@ function getMinimalAction(action, state) {
             target: currentTargetKey,
         };
     }
-    return {minimalAction: currentAction, targetName};
+    return currentAction;
 }
 
 export default function linkTo(navigation, path, type) {
@@ -79,12 +76,8 @@ export default function linkTo(navigation, path, type) {
     }
 
     if (action.payload.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-        const {minimalAction, targetName} = getMinimalAction(action, navigation.getRootState());
+        const minimalAction = getMinimalAction(action, navigation.getRootState());
         if (minimalAction) {
-            // If the target name is RHP that means this action is responsible for changing flow within the RHP e.g. from settings to search. In that case we want to use REPLACE.
-            if (targetName === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-                minimalAction.type = 'REPLACE';
-            }
             root.dispatch(minimalAction);
             return;
         }