diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
index c02b7fb1fe5..5da320d925b 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
@@ -779,7 +779,10 @@ public class SystemCommandsViewPart
 
 		if (source == _folder.getFolder())
 		{
-			updateActionStates();
+			if (_folder.getInput() != null)
+			{
+				updateActionStates();
+			}
 		}
 	}