diff --git a/ModAssistant/Pages/Options.xaml b/ModAssistant/Pages/Options.xaml
index 0376030..f89bbc3 100644
--- a/ModAssistant/Pages/Options.xaml
+++ b/ModAssistant/Pages/Options.xaml
@@ -295,6 +295,14 @@
             Padding="5"
             Click="ApplicationThemeOpenThemesFolder_Click"
             Content="{DynamicResource Options:OpenFolderButton}" />
+        <ComboBox
+            Name="LanguageSelectComboBox"
+            Grid.Row="14"
+            Grid.Column="1"
+            Height="30"
+            HorizontalAlignment="Stretch"
+            VerticalContentAlignment="Center"
+            SelectionChanged="LanguageSelectComboBox_SelectionChanged" />
 
         <TextBlock
             Grid.Row="14"
diff --git a/ModAssistant/Pages/Options.xaml.cs b/ModAssistant/Pages/Options.xaml.cs
index 72a757e..81c3bb3 100644
--- a/ModAssistant/Pages/Options.xaml.cs
+++ b/ModAssistant/Pages/Options.xaml.cs
@@ -331,6 +331,21 @@ namespace ModAssistant.Pages
             }
         }
 
+        public void LanguageSelectComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if ((sender as ComboBox).SelectedItem == null)
+            {
+                // Apply default language
+                Console.WriteLine("Applying default language");
+            }
+            else
+            {
+                // Set new language
+                Console.WriteLine("Setting language to:" + (sender as ComboBox).SelectedItem.ToString());
+                //LoadLanguage((sender as ComboBox).SelectedItem.ToString())
+            }
+        }
+
         private void ApplicationThemeExportTemplate_Click(object sender, RoutedEventArgs e)
         {
             Themes.WriteThemeToDisk("Ugly Kulu-Ya-Ku");