1 files changed, 3 insertions, 4 deletions
diff --git a/cmd2.py b/cmd2.py
index 2b43e1ae..d22ce41c 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -1017,14 +1017,13 @@ class Cmd(cmd.Cmd):
                 if self.cmdqueue:
                     # Run command out of cmdqueue if nonempty (populated by load command or commands at invocation)
                     line = self.cmdqueue.pop(0)
+
+                    if self.echo and line != 'eos':
+                        self.poutput('{}{}'.format(self.prompt, line))
                 else:
                     # Otherwise, read a command from stdin
                     line = self.pseudo_raw_input(self.prompt)
 
-                # If echo is on and in the middle of running a script, then echo the line to the output
-                if self.echo and self._current_script_dir is not None:
-                    self.poutput(line + '\n')
-
                 # Run the command along with all associated pre and post hooks
                 stop = self.onecmd_plus_hooks(line)
         finally: