diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml
index 1e366436..6c04c6f4 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml
+++ b/src/Calculator.Shared/Views/MainPage.xaml
@@ -8,6 +8,7 @@
 			xmlns:converters="using:CalculatorApp.Converters"
 			xmlns:local="using:CalculatorApp"
 			xmlns:vm="using:WindowsCalculatorShared.ViewModel"
+			xmlns:toolkit="using:Uno.UI.Toolkit"
 			x:Name="pageRoot"
 			Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}"
 			Loaded="OnPageLoaded"
@@ -59,8 +60,8 @@
 							Value="Right"/>
 		</Style>
 	</Page.Resources>
-	
-	<Grid>
+
+	<Grid toolkit:VisibleBoundsPadding.PaddingMask="All">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto"/>
 				<!--
diff --git a/src/Calculator.UWP/Calculator.UWP.csproj b/src/Calculator.UWP/Calculator.UWP.csproj
index 08ba4ef1..a4588f04 100644
--- a/src/Calculator.UWP/Calculator.UWP.csproj
+++ b/src/Calculator.UWP/Calculator.UWP.csproj
@@ -8,6 +8,9 @@
     <PackageReference Include="System.Runtime">
       <Version>4.3.1</Version>
     </PackageReference>
+    <PackageReference Include="Uno.UI">
+      <Version>1.45.0-dev.1457</Version>
+    </PackageReference>
   </ItemGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>