diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java b/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java
index e95ae53..834c45f 100644
--- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java
+++ b/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java
@@ -237,6 +237,14 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         runnable.setRunning(false);
         try {
             consoleManager.type(applicationShutdown);
+            try {
+                appThNext.join(ONE_TENTH_OF_SECOND);
+            } catch (InterruptedException e) {
+                LOGGER.warning("Application thread was interrupted!"); //$NON-NLS-1$
+                LOGGER.log(Level.FINE,
+                        "Application thread was interrupted while closing", //$NON-NLS-1$
+                        e);
+            }
             consoleManager.close();
         } catch (IOException e) {
             LOGGER.warning("Unable to close application correctly"); //$NON-NLS-1$