diff --git a/src/main/java/org/jboss/aesh/console/AeshInputProcessor.java b/src/main/java/org/jboss/aesh/console/AeshInputProcessor.java
index 65d139d80..312776354 100644
--- a/src/main/java/org/jboss/aesh/console/AeshInputProcessor.java
+++ b/src/main/java/org/jboss/aesh/console/AeshInputProcessor.java
@@ -167,8 +167,12 @@ else if(action == Action.COMPLETE) {
                 if(completionHandler != null) {
                     completionHandler.setAskDisplayCompletion(false);
                     consoleBuffer.getUndoManager().clear();
+
+                    // display last buffer again, so user can continue typing
                     consoleBuffer.out().print(Config.getLineSeparator());
-                    clearBufferAndDisplayPrompt();
+                    consoleBuffer.displayPrompt();
+                    consoleBuffer.out().print(consoleBuffer.getBuffer().getLine());
+                    prevAction = Action.NEWLINE;
                 }
             }
         }