diff --git a/src/multitasking/fork.c b/src/multitasking/fork.c
index 84629eb..f171a61 100644
--- a/src/multitasking/fork.c
+++ b/src/multitasking/fork.c
@@ -5,6 +5,8 @@
 
 u16 fork(void)
 {
+	if (current_task->esp == current_task->esp0 + STACK_SIZE)
+		scheduler();
 	cli();
 	struct task *child = create_task(current_task->uid);
 	if (!child)