diff --git a/src/Calculator.Shared/Views/Calculator.xaml b/src/Calculator.Shared/Views/Calculator.xaml
index c86ca1a7..287c0b6b 100644
--- a/src/Calculator.Shared/Views/Calculator.xaml
+++ b/src/Calculator.Shared/Views/Calculator.xaml
@@ -907,7 +907,7 @@
 			<VisualStateGroup>
 				<VisualState x:Name="ResultsL">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowHeight="800" />
+						<AdaptiveTrigger x:Name="ResultsMVisualStateTrigger" MinWindowHeight="800" />
 					</VisualState.StateTriggers>
 					<Storyboard />
 				</VisualState>
diff --git a/src/Calculator.Shared/Views/Calculator.xaml.cs b/src/Calculator.Shared/Views/Calculator.xaml.cs
index 3d591e48..422c3775 100644
--- a/src/Calculator.Shared/Views/Calculator.xaml.cs
+++ b/src/Calculator.Shared/Views/Calculator.xaml.cs
@@ -228,21 +228,21 @@ namespace CalculatorApp
                 state = "Programmer";
                 Model.IsDecimalEnabled = false;
                 // UNO TODO
-                // ResultsMVisualStateTrigger.MinWindowHeight = 640;
+                ResultsMVisualStateTrigger.MinWindowHeight = 640;
             }
             else if (IsScientific)
             {
                 state = "Scientific";
                 Model.IsDecimalEnabled = true;
                 // UNO TODO
-                // ResultsMVisualStateTrigger.MinWindowHeight = 544;
+                ResultsMVisualStateTrigger.MinWindowHeight = 544;
             }
             else
             {
                 state = "Standard";
                 Model.IsDecimalEnabled = true;
                 // UNO TODO
-                // ResultsMVisualStateTrigger.MinWindowHeight = 1;
+                ResultsMVisualStateTrigger.MinWindowHeight = 1;
             }
 
             CloseHistoryFlyout();
@@ -376,7 +376,8 @@ namespace CalculatorApp
                 }
                 else
                 {
-                    AnimateWithoutResult.Begin();
+					/* UNO TODO */
+                    AnimateWithoutResult?.Begin();
                 }
             }
         }