diff --git a/src/components/entity/modules/moduleForm.js b/src/components/entity/modules/moduleForm.js
index 821844e..a46990b 100644
--- a/src/components/entity/modules/moduleForm.js
+++ b/src/components/entity/modules/moduleForm.js
@@ -13,7 +13,7 @@ const defaultModule = {
     ModuleImage: null,
 };
 
-const ModuleForm = ({onSubmit, onCancel}) => {
+const ModuleForm = ({originalModule, onSubmit, onCancel}) => {
 
     //   Initialisation -------------
 
@@ -31,7 +31,7 @@ const ModuleForm = ({onSubmit, onCancel}) => {
 
     //   State ----------------------
 
-    const [module, setModule] = useState(defaultModule);
+    const [module, setModule] = useState(originalModule || defaultModule);
 
     //   Handlers -------------------
 
@@ -44,8 +44,8 @@ const ModuleForm = ({onSubmit, onCancel}) => {
 
     //   View -----------------------
 
-    const submitLabel = 'Add';
-    const submitIcon = <Icons.Add/>;
+    const submitLabel = originalModule ? 'Modify' : 'Add';
+    const submitIcon = originalModule ? <Icons.Edit/> : <Icons.Add/>;
 
 
     return (
diff --git a/src/components/screens/ModuleModifyScreen.js b/src/components/screens/ModuleModifyScreen.js
index ae2ccec..a0ec622 100644
--- a/src/components/screens/ModuleModifyScreen.js
+++ b/src/components/screens/ModuleModifyScreen.js
@@ -1,14 +1,24 @@
 import {StyleSheet, Text} from "react-native";
 import Screen from "../layout/Screen";
+import ModuleForm from "../entity/modules/moduleForm";
 
-export const ModuleModifyScreen = () => {
+export const ModuleModifyScreen = ({navigation, route}) => {
 //   Initialisation -------------
+    const {module, onModify} = route.params;
+
 //   State ----------------------
 //   Handlers -------------------
+
+    const handleCancel = () => navigation.navigate.goBack();
+
 //   View -----------------------
     return (
         <Screen style={styles.container}>
-            <Text>Modify</Text>
+            <ModuleForm
+                originalModule={module}
+                onSubmit={onModify}
+                onCancel={handleCancel}
+            />
         </Screen>
     );
 };
diff --git a/src/components/screens/ModuleViewScreen.js b/src/components/screens/ModuleViewScreen.js
index e79d3f4..a08eb9b 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");
+    const goToModifyScreen = () => navigation.navigate("ModuleModifyScreen", { module, onModify });
 
 //   View -----------------------
     return (<Screen>