diff --git a/samples/UI/marginBorderPadding2.xml b/samples/UI/marginBorderPadding2.xml
new file mode 100644
index 00000000..a4e9f5f1
--- /dev/null
+++ b/samples/UI/marginBorderPadding2.xml
@@ -0,0 +1,8 @@
+<Project>
+  <Project.ExportOptions />
+  <Panel Background="#F9CC9DFF" >
+    <Panel Margin="48" BorderThickness="48" Padding="48" Background="#BBD6AFFF" Border="#FFF4C3FF" >
+      <Panel Background="#9ABFE2FF" />
+    </Panel>
+  </Panel>
+</Project>
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/ComboBox.cs b/src/Myra/Graphics2D/UI/ComboBox.cs
index 77bbfd0a..868d0540 100644
--- a/src/Myra/Graphics2D/UI/ComboBox.cs
+++ b/src/Myra/Graphics2D/UI/ComboBox.cs
@@ -134,6 +134,7 @@ private void InternalChild_PressedChanged(object sender, EventArgs e)
 					_listBox.SelectedIndex = 0;
 				}
 
+				_listBox.Width = BorderBounds.Width;
 				Desktop.ShowContextMenu(_listBox, new Point(Bounds.X, Bounds.Bottom));
 			}
 		}