diff --git a/src/SilverlightApp/Views/Participantes.xaml b/src/SilverlightApp/Views/Participantes.xaml
index 5d37b42..fb973ab 100644
--- a/src/SilverlightApp/Views/Participantes.xaml
+++ b/src/SilverlightApp/Views/Participantes.xaml
@@ -31,7 +31,7 @@
                  Grid.RowSpan="2"
                  Margin="20,5" 
                  FontSize="12"
-                 
+                 SizeChanged="ParticipantsList_SizeChanged"
                  >
             <ListBox.ItemTemplate>
                 <DataTemplate>
@@ -49,7 +49,7 @@
             </ListBox.ItemTemplate>
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <toolkit:WrapPanel Orientation="Vertical" MaxHeight="400"/>
+                    <toolkit:WrapPanel Orientation="Vertical"/>
                 </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
         </ListBox>
diff --git a/src/SilverlightApp/Views/Participantes.xaml.cs b/src/SilverlightApp/Views/Participantes.xaml.cs
index 97cee9f..019c912 100644
--- a/src/SilverlightApp/Views/Participantes.xaml.cs
+++ b/src/SilverlightApp/Views/Participantes.xaml.cs
@@ -34,8 +34,9 @@ private void ParticipantsList_SizeChanged(object sender, SizeChangedEventArgs e)
             var wrapPanel = ParticipantsList.GetItemsHost() as WrapPanel;
             if (wrapPanel == null) return;
 
-            wrapPanel.MaxHeight = ((FrameworkElement)sender).ActualHeight;
-            wrapPanel.MaxWidth = ((FrameworkElement)sender).ActualWidth;
+            wrapPanel.MaxHeight = ((FrameworkElement)sender).ActualHeight - 20;
+            
+            //wrapPanel.MaxWidth = ((FrameworkElement)sender).ActualWidth;
         }
 
         private void RemoveParticipant_Click(object sender, RoutedEventArgs e)