diff --git a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
index cdce696..ad5bf4a 100644
--- a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
+++ b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
@@ -120,7 +120,7 @@
             <Setter Property="Background" Value="{DynamicResource IPv4BoxPressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource  TextBoxFocusBorderBrush}" />
         </Style>
-        <Style Selector="^:focus-within">
+        <Style Selector="^:focus-within /template/ Border#PART_Border">
             <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index 159a682..085893c 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -179,6 +179,14 @@
                 <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPressedForeground}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:focus">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorFocusBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorFocusBorderBrush}" />
+            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconFocusForeground}" />
+            </Style>
+        </Style>
 
         <Style Selector="^:dropdownopen">
             <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
diff --git a/src/Ursa/Controls/IPv4Box/IPv4Box.cs b/src/Ursa/Controls/IPv4Box/IPv4Box.cs
index 41b4f52..1dda35d 100644
--- a/src/Ursa/Controls/IPv4Box/IPv4Box.cs
+++ b/src/Ursa/Controls/IPv4Box/IPv4Box.cs
@@ -307,6 +307,7 @@ public class IPv4Box: TemplatedControl
 
     protected override void OnLostFocus(RoutedEventArgs e)
     {
+        base.OnLostFocus(e);
         foreach (var pre in _presenters)
         {
             pre?.HideCaret();