diff --git a/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogView.xaml b/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogView.xaml
index 90f9ae552..19a8e170d 100644
--- a/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogView.xaml
@@ -151,8 +151,8 @@
 
             <mde:Autocomplete Style="{StaticResource MaterialDesignAutocomplete}"
                               AutocompleteSource="{Binding Path=AutocompleteSource}"
-                              SearchOnInitialFocus="True"
                               SelectedItem="{Binding SelectedRegion, Mode=TwoWay}"
+                              SearchOnInitialFocus="True"
                               Hint="Select a logical layout"
                               Margin="0,16,0,0"
                               FontSize="15"
diff --git a/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogViewModel.cs b/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogViewModel.cs
index 50a996e56..1f8dbe9f4 100644
--- a/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Device/DeviceLayoutDialogViewModel.cs
@@ -24,12 +24,7 @@ namespace Artemis.UI.Screens.Settings.Device
             Device = device;
             SelectPhysicalLayout = !device.DeviceProvider.CanDetectPhysicalLayout;
 
-            Task.Run(() =>
-            {
-                AutocompleteSource = new RegionInfoAutocompleteSource();
-                SelectedRegion = AutocompleteSource.Regions.FirstOrDefault(r => r.TwoLetterISORegionName == Device.LogicalLayout ||
-                                                                                r.TwoLetterISORegionName == "US" && Device.LogicalLayout == "NA");
-            });
+            Task.Run(() => AutocompleteSource = new RegionInfoAutocompleteSource());
         }
 
         public ArtemisDevice Device { get; }