diff --git a/BeWo/View/Detail/AI/AiConfigView.xaml b/BeWo/View/Detail/AI/AiConfigView.xaml
index 4b149f9a6..a5f9fcc80 100644
--- a/BeWo/View/Detail/AI/AiConfigView.xaml
+++ b/BeWo/View/Detail/AI/AiConfigView.xaml
@@ -25,11 +25,11 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <GroupBox Style="{StaticResource ObjectEditGroupBox}">
-        <GroupBox.Header> 
+        <GroupBox.Header>
             KI Module Einstellungen
         </GroupBox.Header>
 
-        <Grid HorizontalAlignment="Stretch" Margin="16">
+        <Grid Margin="16" HorizontalAlignment="Stretch">
             <!--<Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" SharedSizeGroup="ai1" />
                 <ColumnDefinition Width="100*" MaxWidth="600" />
diff --git a/BeWo/View/Detail/AiConversationChatView.xaml b/BeWo/View/Detail/AiConversationChatView.xaml
index 8a3409e10..bcddd98bc 100644
--- a/BeWo/View/Detail/AiConversationChatView.xaml
+++ b/BeWo/View/Detail/AiConversationChatView.xaml
@@ -2,6 +2,7 @@
     x:Class="BeWo.View.Detail.AiConversationChatView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ai="clr-namespace:BeWo.View.Detail.AI"
     xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
@@ -13,7 +14,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
-    xmlns:viewmodel="clr-namespace:BeWo.ViewModel" xmlns:ai="clr-namespace:BeWo.View.Detail.AI"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     Width="Auto"
     Height="Auto"
     HorizontalAlignment="Stretch"
@@ -262,49 +263,56 @@
                         </StackPanel>
                     </Grid>
                 </Border>
+                <Popup
+                    x:Name="popup_newview"
+                    Width="200"
+                    Height="200"
+                    StaysOpen="True">
+                    <Grid Margin="5" Background="Orange">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto" />
+                            <ColumnDefinition Width="auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                        </Grid.RowDefinitions>
+                        <Label>Kontext</Label>
+                        <ComboBox Grid.Column="1" />
+                    </Grid>
+                </Popup>
+                <Popup
+                    x:Name="popup_settings"
+                    Width="auto"
+                    Height="auto"
+                    Placement="Center"
+                    StaysOpen="False">
+                    <Border
+                        Padding="5"
+                        Background="{DynamicResource NavigationContentBrush}"
+                        BorderThickness="1"
+                        CornerRadius="5">
+                        <ai:AiConfigView />
+                    </Border>
+
+
+                    <!--<Grid Margin="5" Background="Orange">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="auto" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <Label>Modell:</Label>
+        <ComboBox
+            Grid.Column="1"
+            ItemsSource="{Binding Models}"
+            SelectedItem="{Binding Config.SelectedModel, Mode=TwoWay}" />
+    </Grid>-->
+                </Popup>
             </Grid>
         </GroupBox>
-        <Popup
-            x:Name="popup_newview"
-            Width="200"
-            Height="200"
-            StaysOpen="True">
-            <Grid Margin="5" Background="Orange">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto" />
-                    <ColumnDefinition Width="auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto" />
-                    <RowDefinition Height="auto" />
-                </Grid.RowDefinitions>
-                <Label>Kontext</Label>
-                <ComboBox Grid.Column="1" />
-            </Grid>
-        </Popup>
-        <Popup
-            x:Name="popup_settings"
-            Width="auto"
-            Height="auto"
-            Placement="Center"
-            StaysOpen="False">
-            <ai:AiConfigView DataContext="{Binding}"/>
-
-            <!--<Grid Margin="5" Background="Orange">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto" />
-                    <ColumnDefinition Width="auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto" />
-                    <RowDefinition Height="auto" />
-                </Grid.RowDefinitions>
-                <Label>Modell:</Label>
-                <ComboBox
-                    Grid.Column="1"
-                    ItemsSource="{Binding Models}"
-                    SelectedItem="{Binding Config.SelectedModel, Mode=TwoWay}" />
-            </Grid>-->
-        </Popup>
     </Grid>
 </localView:BeWoView>