diff --git a/ChangeLog b/ChangeLog
index 96a799f43..362ed3e09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
  * src/utils.c:
    Speed up sorting in utils_get_file_list(). This reduces the file
    browser delay on displaying a big directory, e.g. /usr/bin.
+ * src/build.c:
+   Expand command entry width when expanding Build Commands dialog.
 
 
 2009-09-20  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/src/build.c b/src/build.c
index 7dbcc73a6..8d922dc2f 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1731,9 +1731,11 @@ static RowWidgets *build_add_dialog_row(GeanyDocument *doc, GtkTable *table, gin
 	roww->dst = dst;
 	for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++)
 	{
+		gint xflags = (i == GEANY_BC_COMMAND) ? GTK_FILL | GTK_EXPAND : GTK_FILL;
+
 		column += 1;
 		roww->entries[i] = gtk_entry_new();
-		gtk_table_attach(table, roww->entries[i], column, column + 1, row, row + 1, GTK_FILL,
+		gtk_table_attach(table, roww->entries[i], column, column + 1, row, row + 1, xflags,
 			GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding);
 	}
 	column++;