diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 4e84f3bb391..e9ba9f82be2 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-12 Mikhail Khodjaiants
+	Bug 103522: Launcher: Stop at main checkbox is covered with default launch dialog size.
+	Moved the "Stop in main" and "Advanced" buttons on the line below.
+	* CDebuggerTab.java
+
 2005-06-28 Mikhail Khodjaiants
 	Bug 89276: Typo in org.eclipse.cdt.launch/plugin.xml.
 	* plugin.xml
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 4e4ce200f2a..078a89a2dd8 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
@@ -137,12 +137,10 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 				ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB);
 		GridLayout layout = new GridLayout(2, true);
 		comp.setLayout(layout);
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL_HORIZONTAL;
-		gd.grabExcessHorizontalSpace = true;
+		GridData gd = new GridData( GridData.BEGINNING, GridData.CENTER, true, false );
 		comp.setLayoutData(gd);
 
-		createDebuggerCombo(comp, 1);
+		createDebuggerCombo( comp, ( fAttachMode ) ? 1 : 2 );
 		createOptionsComposite(comp);
 		createDebuggerGroup(comp, 2);
 	}
@@ -331,14 +329,14 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		Composite optionsComp = new Composite(parent, SWT.NONE);
 
 		if (fAttachMode == true) {
-			GridLayout layout = new GridLayout(1, false);
-			optionsComp.setLayout(layout);
-			optionsComp.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 1, 1));
+			GridLayout layout = new GridLayout( 1, false );
+			optionsComp.setLayout( layout );
+			optionsComp.setLayoutData( new GridData( GridData.BEGINNING, GridData.CENTER, true, false, 1, 1 ) );
 		} else {
-			GridLayout layout = new GridLayout(2, false);
-			optionsComp.setLayout(layout);
-			optionsComp.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 1, 1));
-			fStopInMain = createCheckButton(optionsComp, LaunchMessages.getString("CDebuggerTab.Stop_at_main_on_startup")); //$NON-NLS-1$
+			GridLayout layout = new GridLayout( 2, false );
+			optionsComp.setLayout( layout );
+			optionsComp.setLayoutData( new GridData( GridData.BEGINNING, GridData.CENTER, true, false, 2, 1 ) );
+			fStopInMain = createCheckButton( optionsComp, LaunchMessages.getString( "CDebuggerTab.Stop_at_main_on_startup" ) ); //$NON-NLS-1$
 			GridData data = new GridData();
 			data.horizontalAlignment = GridData.BEGINNING;
 			fStopInMain.setLayoutData(data);