diff --git a/common/widgets/grid_combobox.cpp b/common/widgets/grid_combobox.cpp
index ca675eaa5c..b07a5d77aa 100644
--- a/common/widgets/grid_combobox.cpp
+++ b/common/widgets/grid_combobox.cpp
@@ -87,6 +87,9 @@ void GRID_CELL_COMBOBOX::BeginEdit( int aRow, int aCol, wxGrid* aGrid )
 
     Combo()->SetFocus();
 
+    // Work around a wxWidgets bug where the drop-down is the wrong width on the first drop.
+    Combo()->Set( Combo()->GetStrings() );
+
 #ifdef __WXOSX_COCOA__
     // This is a work around for the combobox being simply dismissed when a
     // choice is made in it under OS X. The bug is almost certainly due to a