diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java
index 88c388e4ef9..5097561aac5 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java
@@ -125,6 +125,12 @@ public class SystemComboBoxCellEditor extends CellEditor
 
 		comboBox.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
+				
+				// DKM - only process this when there is a selection change
+				//   fix for defect 138324
+				if (selection == comboBox.getSelectionIndex())
+					return; // no change
+				
 				// must set the selection before getting value
 				selection = comboBox.getSelectionIndex();	
 				System.out.println("Inside widgetSelected. selection = " + selection);