diff --git a/Elwig/Controls/IntegerUpDown.xaml b/Elwig/Controls/IntegerUpDown.xaml
index 80fe342..fcf98c9 100644
--- a/Elwig/Controls/IntegerUpDown.xaml
+++ b/Elwig/Controls/IntegerUpDown.xaml
@@ -15,9 +15,8 @@
-
+
@@ -43,6 +42,8 @@
+
+
diff --git a/Elwig/Controls/UnitTextBox.xaml b/Elwig/Controls/UnitTextBox.xaml
index bf3667c..abbabbb 100644
--- a/Elwig/Controls/UnitTextBox.xaml
+++ b/Elwig/Controls/UnitTextBox.xaml
@@ -7,8 +7,7 @@
+ BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
@@ -32,6 +31,8 @@
+
+