1 files changed, 14 insertions, 0 deletions
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 2a325584d1..7e0fcf4416 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -167,6 +167,7 @@ gui_prefs_show(void)
 	/* Main grid */
 	main_grid = ws_gtk_grid_new();
 	gtk_box_pack_start(GTK_BOX(main_vb), main_grid, FALSE, FALSE, 0);
+        gtk_widget_set_vexpand(GTK_WIDGET(main_grid), FALSE); /* Ignore VEXPAND requests from children */
 	ws_gtk_grid_set_row_spacing(GTK_GRID(main_grid), 10);
 	ws_gtk_grid_set_column_spacing(GTK_GRID(main_grid), 15);
 
@@ -561,3 +562,16 @@ scroll_percent_changed_cb(GtkWidget *recent_files_entry _U_,
 	/* We really should pop up a dialog box is newval < 0 or > 100 */
 	return FALSE;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */