diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java
index c03361a87fd..1258dd480c7 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java
@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
+ * Kevin Doyle (IBM) - [182403] Double Click on an object that can be expanded
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view.scratchpad;
@@ -187,7 +188,14 @@ public class SystemScratchpadViewPart extends ViewPart
 		{
 			if (adapter.hasChildren((IAdaptable)element))
 			{
-				setInput((IAdaptable) element);
+				if (_viewer.getExpandedState(element))
+				{
+					_viewer.collapseToLevel(element, 1);
+				}
+				else
+				{
+					_viewer.expandToLevel(element, 1);
+				}
 			}
 			else
 			{