diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
index 4cc4b8b5cf9..559d84c1443 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
@@ -15,6 +15,7 @@
  * David Dykstal (IBM) - moved SystemsPreferencesManager to a new package
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
+ * Kevin Doyle (IBM) - [189005] Changed setFocus() to setInput to SystemRegistryUI
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -113,8 +114,6 @@ import org.eclipse.ui.progress.UIJob;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.osgi.framework.Bundle;
 
-
-
 /**
  * Comment goes here
  */
@@ -244,8 +243,12 @@ public class SystemTableViewPart extends ViewPart
 					if (parent instanceof IAdaptable)
 					{
 						_parent = (IAdaptable) parent;
-						boolean enabled = _parent != null;
-						setEnabled(enabled);
+						setEnabled(true);
+					}
+					else
+					{
+						_parent = null;
+						setEnabled(false);
 					}
 				}
 				else
@@ -1145,7 +1148,7 @@ public class SystemTableViewPart extends ViewPart
 	        }
 	        else
 	        {
-	            setInput(RSECorePlugin.getTheSystemRegistry());
+	            setInput(RSEUIPlugin.getTheSystemRegistryUI());
 	        }
 	    }
 
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java
index 7fda53eec2d..75aca722c36 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java
@@ -24,6 +24,7 @@
  * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter()
+ * Kevin Doyle (IBM) - [189005] Fixed getParent() to return SystemRegistryUI instead of SystemRegistry
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -418,7 +419,7 @@ public class SystemViewConnectionAdapter
 	 */
 	public Object getParent(Object element)
 	{
-		return RSECorePlugin.getTheSystemRegistry();
+		return RSEUIPlugin.getTheSystemRegistryUI();
 	}
 	
 	/**