diff --git a/AUTHORS b/AUTHORS
index 1690dc918..4f4c8ae85 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,4 +35,5 @@ Thanks to the following, who submitted detailed bug reports and excellent sugges
   Bruce Dillahunty
   Askme Too
   Thomas@BIC
+  Ian Mortimer
 
diff --git a/src/command.cpp b/src/command.cpp
index ed1df3024..a55599405 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1163,7 +1163,7 @@ void handleShell ()
       }
     }
   }
-  while (keepGoing);
+  while (keepGoing && !std::cin.eof ());
 }
 #endif