diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java
index 6179b107206..f614bf6c02d 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java
@@ -61,7 +61,7 @@ public class LaunchUIPlugin extends AbstractUIPlugin {
 		return shell;
 	}
 
-	public static void setDebugDialogShell(Shell shell) {
+	public static void setDialogShell(Shell shell) {
 		debugDialogShell = shell;
 	}
 	
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
index af6e6f70af3..f0b3b1a5ab2 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
@@ -121,8 +121,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		gd = new GridData(GridData.FILL_BOTH);
 		gd.horizontalSpan = 2;
 		getDynamicTabHolder().setLayoutData(gd);
-
-		LaunchUIPlugin.setDebugDialogShell(parent.getShell());
 	}
 
 	protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) {
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
index 72772be6a8c..778dedc4a22 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
@@ -140,6 +140,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 				updateLaunchConfigurationDialog();
 			}
 		});
+		LaunchUIPlugin.setDialogShell(parent.getShell());
 	}
 
 	/**
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
index ed303c082de..fdc2cab1eaf 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
@@ -54,8 +54,6 @@ public class CorefileDebuggerTab extends AbstractCDebuggerTab {
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		gd.horizontalSpan = 2;
 		getDynamicTabHolder().setLayoutData(gd);
-
-		LaunchUIPlugin.setDebugDialogShell(parent.getShell());
 	}
 
 	protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) {