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 8df3eb55e14..ca766f817d0 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
@@ -339,8 +339,11 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
 	 */
 	public IWizardPage getNextPage(IWizardPage page) {
 		IWizardPage nextPage = null;
-		if (page != null && page == mainPage && getSelectedWizard() != null) {
-			nextPage = getSelectedWizard().getStartingPage();
+		if (page != null && page == mainPage) {
+			// Save the last selected system type on page transition.
+			// But only if it is the main page.
+			saveWidgetValues();
+			if (getSelectedWizard() != null) nextPage = getSelectedWizard().getStartingPage();
 		}
 		
 		if (nextPage == null) super.getNextPage(page);
@@ -370,14 +373,6 @@ 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>