diff --git a/kernel.asm b/kernel.asm
index 1c2fee7..5a69a61 100644
--- a/kernel.asm
+++ b/kernel.asm
@@ -44,7 +44,9 @@ start:
 	cli 				;block interrupts
 	mov esp, stack_space
 	call kmain
+forever:
 	hlt 				;halt the CPU
+	jmp forever
 
 section .bss
 resb 8192; 8KB for stack
diff --git a/kernel.c b/kernel.c
index 3435fc9..cab094d 100644
--- a/kernel.c
+++ b/kernel.c
@@ -158,6 +158,4 @@ void kmain(void)
 
 	idt_init();
 	kb_init();
-
-	while(1);
 }