diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 50017048..5333d41f 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -516,6 +516,7 @@
                                         ContextRequested="OnContextRequested"
                                         DisplayValue="{x:Bind Model.Value1, Mode=OneWay}"
                                         ExpressionVisibility="Collapsed"
+                                        FlowDirection="{x:Bind LayoutDirection}"
                                         IsActive="{Binding Value1Active, Mode=TwoWay}"
                                         KeyDown="OnValueKeyDown"
                                         Selected="OnValueSelected"
@@ -568,6 +569,7 @@
                                         ContextRequested="OnContextRequested"
                                         DisplayValue="{x:Bind Model.Value2, Mode=OneWay}"
                                         ExpressionVisibility="Collapsed"
+                                        FlowDirection="{x:Bind LayoutDirection}"
                                         IsActive="{Binding Value2Active, Mode=TwoWay}"
                                         KeyDown="OnValueKeyDown"
                                         Selected="OnValueSelected"
@@ -595,7 +597,7 @@
                     Grid.Row="5"
                     Grid.Column="1"
                     MinHeight="48"
-                    Margin="12,0,6,0"
+                    Padding="12,0,6,0"
                     HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
                     VerticalAlignment="Top"
                     FlowDirection="{x:Bind LayoutDirection}"