diff --git a/src/components/screens/ModuleListScreen.js b/src/components/screens/ModuleListScreen.js
index 1a5ec75..1947231 100644
--- a/src/components/screens/ModuleListScreen.js
+++ b/src/components/screens/ModuleListScreen.js
@@ -39,7 +39,7 @@ const ModuleListScreen = ({navigation}) => {
 
     const onModify = (module) => {
         handleModify(module);
-        navigation.navigate('ModuleListScreen');
+        navigation.replace('ModuleViewScreen', { module, onDelete, onModify });
     };
 
     const goToViewScreen = (module) =>
diff --git a/src/components/screens/ModuleViewScreen.js b/src/components/screens/ModuleViewScreen.js
index a08eb9b..2a9da5f 100644
--- a/src/components/screens/ModuleViewScreen.js
+++ b/src/components/screens/ModuleViewScreen.js
@@ -11,7 +11,7 @@ export const ModuleViewScreen = ({navigation, route}) => {
 //   State ----------------------
 //   Handlers -------------------
 
-    const goToModifyScreen = () => navigation.navigate("ModuleModifyScreen", { module, onModify });
+    const goToModifyScreen = () => navigation.replace("ModuleModifyScreen", { module, onModify });
 
 //   View -----------------------
     return (<Screen>