diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
index 556be37357c..ee927ac9c50 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
@@ -546,23 +546,21 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
 			}
 		}
 
-		if (gotShell){
-			IPropertySet set = getPropertySet("Remote"); //$NON-NLS-1$
-			if (set == null){
-				set = createPropertySet("Remote"); //$NON-NLS-1$
-			}
-			if (set != null)
-			{
-				IProperty property = set.getProperty(COMMAND_SHELLS_MEMENTO);
-				if (property == null){
-					property = set.addProperty(COMMAND_SHELLS_MEMENTO, shellBuffer.toString());
-				}
-				else {
-					property.setValue(shellBuffer.toString());
-				}
-			}
-			commit();
+		IPropertySet set = getPropertySet("Remote"); //$NON-NLS-1$
+		if (set == null){
+			set = createPropertySet("Remote"); //$NON-NLS-1$
 		}
+		if (set != null)
+		{
+			IProperty property = set.getProperty(COMMAND_SHELLS_MEMENTO);
+			if (property == null){
+				property = set.addProperty(COMMAND_SHELLS_MEMENTO, shellBuffer.toString());
+			}
+			else {
+				property.setValue(shellBuffer.toString());
+			}
+		}
+		commit();
 	}
 
 	protected void internalRemoveShell(Object command) throws InvocationTargetException,