diff --git a/src/Ryujinx.Ava/App.axaml.cs b/src/Ryujinx.Ava/App.axaml.cs
index 387a6dc145..30bcfe7901 100644
--- a/src/Ryujinx.Ava/App.axaml.cs
+++ b/src/Ryujinx.Ava/App.axaml.cs
@@ -38,14 +38,17 @@ namespace Ryujinx.Ava
 
             base.OnFrameworkInitializationCompleted();
 
-            if (Program.PreviewerDetached)
-            {
-                ApplyConfiguredTheme();
 
-                ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event;
-                ConfigurationState.Instance.UI.CustomThemePath.Event += ThemeChanged_Event;
-                ConfigurationState.Instance.UI.EnableCustomTheme.Event += CustomThemeChanged_Event;
+            if (!Program.PreviewerDetached)
+            {
+                ConfigurationState.Initialize();
             }
+
+            ApplyConfiguredTheme();
+
+            ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event;
+            ConfigurationState.Instance.UI.CustomThemePath.Event += ThemeChanged_Event;
+            ConfigurationState.Instance.UI.EnableCustomTheme.Event += CustomThemeChanged_Event;
         }
 
         private void CustomThemeChanged_Event(object sender, ReactiveEventArgs<bool> e)
diff --git a/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs b/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
index b2f3e7ab95..4f69b3ce25 100644
--- a/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
+++ b/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
@@ -5,7 +5,6 @@ using Ryujinx.UI.Common.Configuration;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Globalization;
 
 namespace Ryujinx.Ava.Common.Locale
 {
@@ -32,21 +31,8 @@ namespace Ryujinx.Ava.Common.Locale
 
         public void Load()
         {
-            // Load the system Language Code.
-            string localeLanguageCode = CultureInfo.CurrentCulture.Name.Replace('-', '_');
-
-            // If the view is loaded with the UI Previewer detached, then override it with the saved one or default.
-            if (Program.PreviewerDetached)
-            {
-                if (!string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value))
-                {
-                    localeLanguageCode = ConfigurationState.Instance.UI.LanguageCode.Value;
-                }
-                else
-                {
-                    localeLanguageCode = DefaultLanguageCode;
-                }
-            }
+            string localeLanguageCode = string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
+                DefaultLanguageCode : ConfigurationState.Instance.UI.LanguageCode.Value;
 
             // Load en_US as default, if the target language translation is incomplete.
             LoadDefaultLanguage();
diff --git a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
index bcaa086000..22482e7378 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
@@ -277,10 +277,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
-            if (Program.PreviewerDetached)
-            {
-                Task.Run(LoadTimeZones);
-            }
+            Task.Run(LoadTimeZones);
         }
 
         public SettingsViewModel()
@@ -294,11 +291,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             Task.Run(CheckSoundBackends);
             Task.Run(PopulateNetworkInterfaces);
 
-            if (Program.PreviewerDetached)
-            {
-                Task.Run(LoadAvailableGpus);
-                LoadCurrentConfiguration();
-            }
+            Task.Run(LoadAvailableGpus);
+            LoadCurrentConfiguration();
         }
 
         public async Task CheckSoundBackends()
@@ -407,8 +401,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             ShowConfirmExit = config.ShowConfirmExit;
             HideCursor = (int)config.HideCursor.Value;
 
-            GameDirectories.Clear();
-            GameDirectories.AddRange(config.UI.GameDirs.Value);
+            if (Program.PreviewerDetached)
+            {
+                GameDirectories.Clear();
+                GameDirectories.AddRange(config.UI.GameDirs.Value);
+            }
 
             BaseStyleIndex = config.UI.BaseStyle == "Light" ? 0 : 1;
 
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml
index cc21b5c60f..2b7eb2911c 100644
--- a/src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml
+++ b/src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml
@@ -8,7 +8,7 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+    mc:Ignorable="d" d:DesignWidth="1000"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainViewControls"
     x:DataType="viewModels:MainWindowViewModel">
     <Design.DataContext>
diff --git a/src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs b/src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs
index 8829cb10b0..6076a68d2c 100644
--- a/src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs
+++ b/src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs
@@ -29,10 +29,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
-            if (Program.PreviewerDetached)
-            {
-                Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.Amiibo];
-            }
+            Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.Amiibo];
         }
 
         public bool IsScanned { get; set; }
diff --git a/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
index 33a9af5b61..6bb3c5dd5b 100644
--- a/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
@@ -78,13 +78,10 @@ namespace Ryujinx.Ava.UI.Windows
             Height = ((Height - barHeight) / Program.WindowScaleFactor) + barHeight;
             Width /= Program.WindowScaleFactor;
 
-            if (Program.PreviewerDetached)
-            {
-                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver());
+            InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver());
 
-                this.GetObservable(IsActiveProperty).Subscribe(IsActiveChanged);
-                this.ScalingChanged += OnScalingChanged;
-            }
+            this.GetObservable(IsActiveProperty).Subscribe(IsActiveChanged);
+            this.ScalingChanged += OnScalingChanged;
         }
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
diff --git a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml b/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
index 40cac90ddc..c1db0b3d98 100644
--- a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
@@ -17,6 +17,8 @@
     WindowStartupLocation="CenterOwner"
     x:DataType="viewModels:SettingsViewModel"
     mc:Ignorable="d"
+    d:DesignHeight="800"
+    d:DesignWidth="1000"
     Focusable="True">
     <Design.DataContext>
         <viewModels:SettingsViewModel />