diff --git a/input.c b/input.c
index 665d45473..bb6ea77b6 100644
--- a/input.c
+++ b/input.c
@@ -136,7 +136,6 @@ static const wchar_t *name_arr[] =
 	L"backward-kill-word",
 	L"dump-functions",
 	L"winch",
-	L"exit",
 	L"history-token-search-backward",
 	L"history-token-search-forward",
 	L"self-insert",
@@ -220,7 +219,6 @@ static const wchar_t code_arr[] =
 	R_BACKWARD_KILL_WORD,
 	R_DUMP_FUNCTIONS,
 	R_WINCH,
-	R_EXIT,
 	R_HISTORY_TOKEN_SEARCH_BACKWARD,
 	R_HISTORY_TOKEN_SEARCH_FORWARD,
 	R_SELF_INSERT,
@@ -339,14 +337,6 @@ static int interrupt_handler()
 	if( job_reap( 1 ) )
 		repaint();
 	
-	/*
-	  Check if we should exit
-	*/
-	if( exit_status() )
-	{
-		return R_EXIT;
-	}
-	
 	/*
 	  Tell the reader an event occured
 	*/
diff --git a/input.h b/input.h
index 575c34cbb..019359342 100644
--- a/input.h
+++ b/input.h
@@ -40,7 +40,6 @@ enum
 	R_BACKWARD_KILL_WORD,
 	R_DUMP_FUNCTIONS,
 	R_WINCH,
-	R_EXIT,
 	R_HISTORY_TOKEN_SEARCH_BACKWARD,
 	R_HISTORY_TOKEN_SEARCH_FORWARD,
 	R_SELF_INSERT,
diff --git a/reader.c b/reader.c
index 7fdc4227a..6a15ca4f7 100644
--- a/reader.c
+++ b/reader.c
@@ -2688,16 +2688,6 @@ wchar_t *reader_readline()
 				break;
 			}
 
-			/* exit, but only if line is empty */
-			case R_EXIT:
-			{
-				if( data->buff_len == 0 )
-				{
-					data->end_loop=1;
-				}
-				break;
-			}
-
 			/*
 			  Evaluate. If the current command is unfinished, or if
 			  the charater is escaped using a backslash, insert a