diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java
index f5b0a75ef1b..1fd2e7fc508 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java
@@ -1241,16 +1241,7 @@ implements  ISystemViewElementAdapter, ISystemRemoteElementAdapter
 			}
 			else if (name.equals(ISystemPropertyConstants.P_SHELL_CONTEXT))
 			{
-			    Object context = cmdShell.getContext();
-			    if (context instanceof IRemoteFile)
-			    {			        
-			        IRemoteFile cwd = (IRemoteFile)context;
-			        return cwd.getAbsolutePath();			        	
-			    }
-			    else
-			     {
-			        return context;
-			     }
+				return cmdShell.getContextString();
 			}
 		}
 		return ""; //$NON-NLS-1$