diff --git a/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog b/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
index 2456b33a9f4..bded9c2603d 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-11 Mikhail Khodjaiants
+	Bug 156114: GDB options layout problem.
+	Applied patch from Vladimir Prus (vladimir@codesourcery.com).
+	* StandardGDBDebuggerPage.java
+
 2006-04-16 Mikhail Khodjaiants
 	Bug 113107: Make trace logs more readily available.
 	* MIUIMessages.properties
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java
index 60ddc8f2dc3..ba7ce9f510f 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java
@@ -7,6 +7,8 @@
  *
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
+ *     Vadimir Prus (vladimir@codesourcery.com) - bug 156114: GDB options layout 
+ *     problem
  *******************************************************************************/
 package org.eclipse.cdt.debug.mi.internal.ui;
 
@@ -36,6 +38,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
@@ -177,6 +180,11 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob
 			// use default
 		}
 		fVerboseModeButton.setSelection( verboseMode );
+		
+		// We've populated combos, which affects their preferred size, and so must relayout things.
+		Control changed[] = { fCommandFactoryCombo, fProtocolCombo };
+		((Composite) getControl()).layout( changed );
+
 		setInitializing( false ); 
 	}