diff --git a/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml b/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml
index c4a2144..5dfda04 100644
--- a/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml
+++ b/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml
@@ -27,20 +27,23 @@
     <Border x:Name="MainBorder"
             x:FieldModifier="private"
             Background="#01000000"
-            Padding="10"
+            Padding="10 13 10 10"
             HorizontalAlignment="Right"
             VerticalAlignment="Bottom">
         <Grid VerticalAlignment="Bottom">
 
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <!--Grid Row 0: Close Button-->
-            <Grid Grid.Row="0">
+            <Grid x:Name="WindowStateBarContainer"
+                  x:FieldModifier="private"
+                  Grid.Row="0"
+                  MinHeight="26">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
diff --git a/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml.cs b/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml.cs
index ff4e359..7fd337f 100644
--- a/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml.cs
+++ b/FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml.cs
@@ -96,6 +96,7 @@ namespace FasdDesktopUi.Pages.SearchPage
                 };
                 SizeChanged += (s, e) => ScheduleSearchResultMaxHeightUpdate();
                 SearchBarUc.SizeChanged += (s, e) => ScheduleSearchResultMaxHeightUpdate();
+                WindowStateBarContainer.SizeChanged += (s, e) => ScheduleSearchResultMaxHeightUpdate();
                 BodyStack_TicketOverview.SizeChanged += (s, e) => ScheduleSearchResultMaxHeightUpdate();
                 SearchHistoryBorder.SizeChanged += (s, e) => ScheduleSearchResultMaxHeightUpdate();
 
@@ -136,6 +137,7 @@ namespace FasdDesktopUi.Pages.SearchPage
             var reservedHeight = 0.0;
 
             reservedHeight += GetVisibleHeightWithMargin(SearchBarUc);
+            reservedHeight += GetVisibleHeightWithMargin(WindowStateBarContainer);
             reservedHeight += GetVisibleHeightWithMargin(BodyStack_TicketOverview);
             reservedHeight += GetVisibleHeightWithMargin(SearchHistoryBorder);