diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
index 724e40833c4..cd5e655638d 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
@@ -303,6 +303,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda
 		if (shell == null || shell.isDisposed() || !shell.isVisible() || !shell.isEnabled())
 		{
 			// get a new shell
+			// FIXME it looks like actions could be contributed into a wrong shell with this.
 			Shell[] shells = Display.getCurrent().getShells();
 			Shell lshell = null;
 			for (int i = 0; i < shells.length && lshell == null; i++)