diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index e9bcd424c9..166a583363 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -370,6 +370,16 @@
   <data name="MouseWithoutBorders_SameSubnetOnly.Description" xml:space="preserve">
     <value>Only connect to machines in the same intranet NNN.NNN.*.* (only works when both machines have IPv4 enabled)</value>
   </data>
+  <data name="MouseWithoutBorders_IPAddressMapping_TextBoxControl.PlaceholderText" xml:space="preserve">
+    <value>Example: MyLaptop 192.168.0.24</value>
+    <comment>Don't translate MyLaptop</comment>
+  </data>
+  <data name="MouseWithoutBorders_IPAddressMapping.Header" xml:space="preserve">
+    <value>IP address mapping</value>
+  </data>
+  <data name="MouseWithoutBorders_IPAddressMapping.Description" xml:space="preserve">
+    <value>Resolve machine's IP address using manually entered mappings below.</value>
+  </data>
   <data name="MouseWithoutBorders_BlockScreenSaverOnOtherMachines.Description" xml:space="preserve">
     <value>Prevent screen saver from starting on other machines when user is actively working on this machine.</value>
   </data>
@@ -386,6 +396,9 @@
     <value>Keyboard shortcuts</value>
     <comment>keyboard is the hardware peripheral</comment>
   </data>
+  <data name="MouseWithoutBorders_AdvancedSettings_Group.Header" xml:space="preserve">
+    <value>Advanced Settings</value>
+  </data>
   <data name="MouseWithoutBorders_EasyMouseOption.Header" xml:space="preserve">
     <value>Easy Mouse: move between machines by moving the mouse pointer to the screen edges.</value>
   </data>
diff --git a/src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs
index 157115758f..d4fe23118b 100644
--- a/src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs
@@ -736,6 +736,28 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public string Name2IP
+        {
+            // Due to https://github.com/microsoft/microsoft-ui-xaml/issues/1826, we must
+            // add back \n chars on set and remove them on get for the widget
+            // to make its behavior consistent with the old UI and MWB internal code.
+            get
+            {
+                return Settings.Properties.Name2IP.Value.Replace("\r\n", "\r");
+            }
+
+            set
+            {
+                var newValue = value.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", "\r\n");
+
+                if (Settings.Properties.Name2IP.Value != newValue)
+                {
+                    Settings.Properties.Name2IP.Value = newValue;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
         public bool SameSubnetOnly
         {
             get
diff --git a/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml
index 62cfd18ca4..09560a2c82 100644
--- a/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml
@@ -386,6 +386,28 @@
                         </ComboBox>
                     </labs:SettingsCard>
                 </controls:SettingsGroup>
+                <controls:SettingsGroup
+                        x:Uid="MouseWithoutBorders_AdvancedSettings_Group"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                            x:Uid="MouseWithoutBorders_IPAddressMapping"
+                            IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Vertical"
+                                    HorizontalContentAlignment="Stretch">
+                                <TextBox
+                                        x:Uid="MouseWithoutBorders_IPAddressMapping_TextBoxControl"
+                                        MinWidth="240" MinHeight="160"
+                                        AcceptsReturn="True"
+                                        ScrollViewer.IsVerticalRailEnabled="True"
+                                        ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                        ScrollViewer.VerticalScrollMode="Enabled"
+                                        Text="{x:Bind Mode=TwoWay, Path=ViewModel.Name2IP, UpdateSourceTrigger=PropertyChanged}"
+                                        TextWrapping="Wrap" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+                </controls:SettingsGroup>                
                 <controls:SettingsGroup x:Uid="MouseWithoutBorders_TroubleShooting" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <labs:SettingsCard
                         x:Uid="MouseWithoutBorders_AddFirewallRuleButtonControl"