diff --git a/CHANGES b/CHANGES
index c04481d96..4d9b89586 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,7 @@ Misc:
  - OpenGL: Add texSize uniform
  - Qt: Add refresh button to controller editing
  - ARM7: Clean up instruction decoding for future expandability
+ - Debugger: CLI debugger now exits when end-of-stream is reached
 
 0.4.0: (2016-02-02)
 Features:
diff --git a/src/debugger/cli-debugger.c b/src/debugger/cli-debugger.c
index 9a6444580..62ec56e05 100644
--- a/src/debugger/cli-debugger.c
+++ b/src/debugger/cli-debugger.c
@@ -617,6 +617,7 @@ static void _commandLine(struct mDebugger* debugger) {
 	while (debugger->state == DEBUGGER_PAUSED) {
 		line = el_gets(cliDebugger->elstate, &count);
 		if (!line) {
+			debugger->state = DEBUGGER_SHUTDOWN;
 			return;
 		}
 		if (line[0] == '\n') {