diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java
index 366060da16f..f26b58a5693 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java
@@ -94,8 +94,9 @@ public class SshHostShell extends AbstractHostShell implements IHostShell {
 		    	&& !initialWorkingDirectory.equals("Command Shell") //$NON-NLS-1$ //FIXME workaround for bug 153047
 		    ) { 
 			    writeToShell("cd "+initialWorkingDirectory); //$NON-NLS-1$
-		    }
-		    if(commandToRun!=null && commandToRun.length()>0 && !commandToRun.equals(SHELL_INVOCATION)) {
+		    } else if (SHELL_INVOCATION.equals(commandToRun)) {
+		    	writeToShell(getPromptCommand());
+		    } else if(commandToRun!=null && commandToRun.length()>0) {
 		    	writeToShell(commandToRun);
 		    }
 		} catch(Exception e) {