diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
index 45599fb128b..a9b5ce4a2a1 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
@@ -869,9 +869,9 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
 			char character = event.character;
 
 			//if (!isConnected()) {
-			if (fState==TerminalState.CLOSED && isConnectOnEnterIfClosed()) {
+			if (fState==TerminalState.CLOSED) {
 				// Pressing ENTER while not connected causes us to connect.
-				if (character == '\r') {
+				if (character == '\r' && isConnectOnEnterIfClosed()) {
 					connectTerminal();
 					return;
 				}