diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
index 07ecd39c48a..8df3eb55e14 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
@@ -323,9 +323,6 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
 			container.updateTitleBar();
 			container.updateButtons();
 		}
-		
-		// Save the current selection to the dialog settings
-		saveWidgetValues();
 	}
 
 	/* (non-Javadoc)
@@ -373,6 +370,14 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
 		return true;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.wizard.Wizard#doNextPressed()
+	 */
+	protected boolean doNextPressed() {
+		saveWidgetValues();
+		return super.doNextPressed();
+	}
+
 	/**
 	 * Save the last selected system type id to the dialog settings.
 	 * Called from <code>onSelectedSystemTypeChanged</code> and <code>