diff --git a/GUI/SettingsWindow.xaml b/GUI/SettingsWindow.xaml
index f673ed15..5f47c4c2 100644
--- a/GUI/SettingsWindow.xaml
+++ b/GUI/SettingsWindow.xaml
@@ -46,6 +46,7 @@ IN THE SOFTWARE.
             <CheckBox DataContext="{TemplateBinding DataContext}" IsChecked="{Binding Value}"
                       Content="{Binding Text}" ToolTip="{Binding Description}" Margin="2"/>
         </ControlTemplate>
+        <TextBlock x:Key="FormatsPanel" Text="Not much settings implemented so far."/>
 
         <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
             <Setter Property="Focusable" Value="False"/>
@@ -170,7 +171,7 @@ IN THE SOFTWARE.
                 <StackPanel Orientation="Vertical" DataContext="{Binding ElementName=SectionsPane,Path=SelectedItem}">
                     <TextBlock Text="{Binding SectionTitle}" Background="{StaticResource SectionTitleBackground}"
                                FontWeight="Bold" FontSize="14" Padding="2,0,2,0" Margin="0,0,0,4"/>
-                    <StackPanel x:Name="SettingsPane"/>
+                    <Decorator x:Name="SettingsPane"/>
                 </StackPanel>
             </ScrollViewer>
         </Border>
diff --git a/GUI/SettingsWindow.xaml.cs b/GUI/SettingsWindow.xaml.cs
index f4e6a094..e5a02ea2 100644
--- a/GUI/SettingsWindow.xaml.cs
+++ b/GUI/SettingsWindow.xaml.cs
@@ -52,10 +52,10 @@ namespace GARbro.GUI
 
         private void OnSectionChanged (object sender, System.Windows.RoutedEventArgs e)
         {
-            this.SettingsPane.Children.Clear();
+            this.SettingsPane.Child = null;
             var section = SectionsPane.SelectedValue as SettingsSectionView;
             if (section != null && section.Panel != null)
-                this.SettingsPane.Children.Add (section.Panel);
+                this.SettingsPane.Child = section.Panel;
         }
 
         private void Button_ClickApply (object sender, System.Windows.RoutedEventArgs e)
@@ -86,7 +86,8 @@ namespace GARbro.GUI
             SettingsSectionView[] list = {
                 new SettingsSectionView {
                     Label = "Formats",
-                    Children = EnumerateFormatsSettings()
+                    Children = EnumerateFormatsSettings(),
+                    Panel = (UIElement)this.Resources["FormatsPanel"]
                 },
             };
             SettingsSectionView selected_section = null;