diff --git a/FluentTerminal.App/App.xaml b/FluentTerminal.App/App.xaml
index 061c2b0..98d40d2 100644
--- a/FluentTerminal.App/App.xaml
+++ b/FluentTerminal.App/App.xaml
@@ -1,12 +1,23 @@
 <Application
     x:Class="FluentTerminal.App.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="using:FluentTerminal.App.Converters">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles\Custom.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <converters:IntToVisibilityConverter
+                x:Key="OneToVisibleConverter"
+                Else="Collapsed"
+                If="1"
+                Then="Visible" />
+            <converters:IntToVisibilityConverter
+                x:Key="OneToCollapsedConverter"
+                Else="Visible"
+                If="1"
+                Then="Collapsed" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/FluentTerminal.App/App.xaml.cs b/FluentTerminal.App/App.xaml.cs
index f826d0b..892d48e 100644
--- a/FluentTerminal.App/App.xaml.cs
+++ b/FluentTerminal.App/App.xaml.cs
@@ -3,8 +3,12 @@ using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Implementation;
 using FluentTerminal.App.ViewModels;
 using FluentTerminal.App.Views;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
@@ -26,11 +30,16 @@ namespace FluentTerminal.App
         public static App Instance;
         private bool _alreadyLaunched;
         private IContainer _container;
-        private int _openTerminalWindows;
         private int? _settingsWindowId;
+        private readonly ISettingsService _settingsService;
+        private ApplicationSettings _applicationSettings;
+
+        private List<MainViewModel> _mainViewModels;
 
         public App()
         {
+            _mainViewModels = new List<MainViewModel>();
+
             InitializeComponent();
             Instance = this;
 
@@ -44,13 +53,21 @@ namespace FluentTerminal.App
             builder.RegisterType<SettingsViewModel>().InstancePerDependency();
 
             _container = builder.Build();
+
+            _settingsService = _container.Resolve<ISettingsService>();
+            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+
+            _applicationSettings = _settingsService.GetApplicationSettings();
+        }
+
+        private void OnApplicationSettingsChanged(object sender, EventArgs e)
+        {
+            _applicationSettings = _settingsService.GetApplicationSettings();
         }
 
         public async Task CreateNewTerminalWindow(string startupDirectory)
         {
-            var viewModel = _container.Resolve<MainViewModel>();
-            viewModel.AddTerminal(startupDirectory);
-            var id = await CreateSecondaryView(typeof(MainPage), viewModel, true);
+            var id = await CreateSecondaryView<MainViewModel>(typeof(MainPage), true, startupDirectory);
             await ApplicationViewSwitcher.TryShowAsStandaloneAsync(id);
         }
 
@@ -63,15 +80,14 @@ namespace FluentTerminal.App
         {
             if (_settingsWindowId == null)
             {
-                var viewModel = _container.Resolve<SettingsViewModel>();
-                _settingsWindowId = await CreateSecondaryView(typeof(SettingsPage), viewModel, true);
+                _settingsWindowId = await CreateSecondaryView<SettingsViewModel>(typeof(SettingsPage), true, null);
             }
             await ApplicationViewSwitcher.TryShowAsStandaloneAsync(_settingsWindowId.Value);
         }
 
-        public void TerminalWindowClosed()
+        public void TerminalWindowClosed(MainViewModel viewModel)
         {
-            _openTerminalWindows--;
+            _mainViewModels.Remove(viewModel);
         }
 
         protected override async void OnActivated(IActivatedEventArgs args)
@@ -95,7 +111,15 @@ namespace FluentTerminal.App
                     }
                     else if (command == "new")
                     {
-                        await CreateNewTerminalWindow(parameter);
+                        if (_applicationSettings.NewTerminalLocation == NewTerminalLocation.Tab && _mainViewModels.Any())
+                        {
+                            await _mainViewModels.Last().AddTerminal(parameter);
+                        }
+                        else
+                        {
+                            await CreateNewTerminalWindow(parameter);
+                        }
+
                     }
                 }
                 else
@@ -107,9 +131,16 @@ namespace FluentTerminal.App
                     }
                     else if (command == "new")
                     {
-                        var viewModel = _container.Resolve<MainViewModel>();
-                        viewModel.AddTerminal(parameter);
-                        await CreateMainView(typeof(MainPage), viewModel, true);
+                        if (_applicationSettings.NewTerminalLocation == NewTerminalLocation.Tab && _mainViewModels.Any())
+                        {
+                            await _mainViewModels.Last().AddTerminal(parameter);
+                        }
+                        else
+                        {
+                            var viewModel = _container.Resolve<MainViewModel>();
+                            await viewModel.AddTerminal(parameter);
+                            await CreateMainView(typeof(MainPage), viewModel, true);
+                        }
                     }
                 }
             }
@@ -132,15 +163,13 @@ namespace FluentTerminal.App
             if (!_alreadyLaunched)
             {
                 var viewModel = _container.Resolve<MainViewModel>();
-                viewModel.AddTerminal(null);
+                await viewModel.AddTerminal(null);
                 await CreateMainView(typeof(MainPage), viewModel, true);
                 Window.Current.Activate();
             }
-            else if (_openTerminalWindows == 0)
+            else if (_mainViewModels.Any() == false)
             {
-                var viewModel = _container.Resolve<MainViewModel>();
-                viewModel.AddTerminal(null);
-                await CreateSecondaryView(typeof(MainPage), viewModel, true);
+                await CreateSecondaryView<MainViewModel>(typeof(MainPage), true, string.Empty);
             }
         }
 
@@ -161,9 +190,9 @@ namespace FluentTerminal.App
             {
                 CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = extendViewIntoTitleBar;
 
-                if (pageType == typeof(MainPage))
+                if (viewModel is MainViewModel mainViewModel)
                 {
-                    _openTerminalWindows++;
+                    _mainViewModels.Add(mainViewModel);
                 }
 
                 rootFrame.Navigate(pageType, viewModel);
@@ -172,11 +201,14 @@ namespace FluentTerminal.App
             Window.Current.Activate();
         }
 
-        private async Task<int> CreateSecondaryView(Type pageType, INotifyPropertyChanged viewModel, bool ExtendViewIntoTitleBar)
+        private async Task<int> CreateSecondaryView<TViewModel>(Type pageType, bool ExtendViewIntoTitleBar, object parameter)
         {
             int windowId = 0;
+            TViewModel viewModel = default;
             await CoreApplication.CreateNewView().Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
+                viewModel = _container.Resolve<TViewModel>();
+                
                 CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = ExtendViewIntoTitleBar;
                 var frame = new Frame();
                 frame.Navigate(pageType, viewModel);
@@ -186,9 +218,10 @@ namespace FluentTerminal.App
                 windowId = ApplicationView.GetForCurrentView().Id;
             });
 
-            if (pageType == typeof(MainPage))
+            if (viewModel is MainViewModel mainViewModel && parameter is string directory)
             {
-                _openTerminalWindows++;
+                _mainViewModels.Add(mainViewModel);
+                await mainViewModel.AddTerminal(directory);
             }
 
             return windowId;
diff --git a/FluentTerminal.App/FluentTerminal.App.csproj b/FluentTerminal.App/FluentTerminal.App.csproj
index ea5612f..a2c7239 100644
--- a/FluentTerminal.App/FluentTerminal.App.csproj
+++ b/FluentTerminal.App/FluentTerminal.App.csproj
@@ -79,6 +79,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -122,6 +123,7 @@
     <Compile Include="Utilities\IHttpContentExtensions.cs" />
     <Compile Include="ViewModels\MainViewModel.cs" />
     <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="ViewModels\Settings\GeneralPageViewModel.cs" />
     <Compile Include="ViewModels\Settings\KeyBindingsPageViewModel.cs" />
     <Compile Include="ViewModels\Settings\KeyBindingsViewModel.cs" />
     <Compile Include="ViewModels\Settings\KeyBindingViewModel.cs" />
diff --git a/FluentTerminal.App/Services/Implementation/DefaultValueProvider.cs b/FluentTerminal.App/Services/Implementation/DefaultValueProvider.cs
index 4c23cf5..d9b1b57 100644
--- a/FluentTerminal.App/Services/Implementation/DefaultValueProvider.cs
+++ b/FluentTerminal.App/Services/Implementation/DefaultValueProvider.cs
@@ -13,7 +13,8 @@ namespace FluentTerminal.App.Services.Implementation
             return new ApplicationSettings
             {
                 ConfirmClosingTabs = false,
-                ConfirmClosingWindows = false
+                ConfirmClosingWindows = false,
+                NewTerminalLocation = NewTerminalLocation.Tab
             };
         }
 
diff --git a/FluentTerminal.App/ViewModels/MainViewModel.cs b/FluentTerminal.App/ViewModels/MainViewModel.cs
index 2165bda..a48bd4b 100644
--- a/FluentTerminal.App/ViewModels/MainViewModel.cs
+++ b/FluentTerminal.App/ViewModels/MainViewModel.cs
@@ -25,6 +25,7 @@ namespace FluentTerminal.App.ViewModels
         private CoreDispatcher _dispatcher;
         private int _nextTerminalId;
         private TerminalViewModel _selectedTerminal;
+        private string _title;
 
         public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService)
         {
@@ -48,6 +49,10 @@ namespace FluentTerminal.App.ViewModels
             AddTerminalCommand = new RelayCommand(() => AddTerminal(null));
             ShowSettingsCommand = new RelayCommand(async () => await ShowSettings());
 
+            Terminals.CollectionChanged += OnTerminalsCollectionChanged;
+
+            Title = "Fluent Terminal";
+
             _dispatcher = CoreApplication.GetCurrentView().Dispatcher;
             SystemNavigationManagerPreview.GetForCurrentView().CloseRequested += OnCloseRequest;
         }
@@ -82,13 +87,23 @@ namespace FluentTerminal.App.ViewModels
 
         public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
 
-        public void AddTerminal(string startupDirectory)
+        public string Title
         {
-            var terminal = new TerminalViewModel(GetNextTerminalId(), _settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService, _applicationSettings, startupDirectory);
-            terminal.CloseRequested += OnTerminalCloseRequested;
-            Terminals.Add(terminal);
+            get => _title;
+            set => Set(ref _title, value);
+        }
 
-            SelectedTerminal = terminal;
+        public Task AddTerminal(string startupDirectory)
+        {
+            return _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+            {
+                var terminal = new TerminalViewModel(GetNextTerminalId(), _settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService, _applicationSettings, startupDirectory);
+                terminal.CloseRequested += OnTerminalCloseRequested;
+                terminal.TitleChanged += OnTitleChanged;
+                Terminals.Add(terminal);
+
+                SelectedTerminal = terminal;
+            }).AsTask();
         }
 
         public void CloseAllTerminals()
@@ -111,7 +126,7 @@ namespace FluentTerminal.App.ViewModels
 
         private Task NewWindow()
         {
-            return App.Instance.CreateNewTerminalWindow(null);
+            return App.Instance.CreateNewTerminalWindow(string.Empty);
         }
 
         private async void OnApplicationSettingsChanged(object sender, EventArgs e)
@@ -133,7 +148,7 @@ namespace FluentTerminal.App.ViewModels
                 if (result == DialogButton.OK)
                 {
                     CloseAllTerminals();
-                    App.Instance.TerminalWindowClosed();
+                    App.Instance.TerminalWindowClosed(this);
                 }
                 else
                 {
@@ -143,7 +158,7 @@ namespace FluentTerminal.App.ViewModels
             else
             {
                 CloseAllTerminals();
-                App.Instance.TerminalWindowClosed();
+                App.Instance.TerminalWindowClosed(this);
             }
             deferral.Complete();
         }
@@ -176,6 +191,22 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
+        private void OnTerminalsCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (Terminals.Any())
+            {
+                Title = Terminals.First().Title;
+            }
+        }
+
+        private void OnTitleChanged(object sender, string e)
+        {
+            if (sender is TerminalViewModel terminal && Terminals.First() == terminal)
+            {
+                Title = e;
+            }
+        }
+
         private void SelectNextTab()
         {
             var currentIndex = Terminals.IndexOf(SelectedTerminal);
diff --git a/FluentTerminal.App/ViewModels/Settings/GeneralPageViewModel.cs b/FluentTerminal.App/ViewModels/Settings/GeneralPageViewModel.cs
new file mode 100644
index 0000000..17a13cd
--- /dev/null
+++ b/FluentTerminal.App/ViewModels/Settings/GeneralPageViewModel.cs
@@ -0,0 +1,101 @@
+using FluentTerminal.App.Services;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.ViewModels.Settings
+{
+    public class GeneralPageViewModel : ViewModelBase
+    {
+        private readonly IDefaultValueProvider _defaultValueProvider;
+        private readonly IDialogService _dialogService;
+        private readonly ISettingsService _settingsService;
+        private ApplicationSettings _applicationSettings;
+        private bool _editingNewTerminalLocation;
+
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
+        {
+            _settingsService = settingsService;
+            _dialogService = dialogService;
+            _defaultValueProvider = defaultValueProvider;
+            _applicationSettings = _settingsService.GetApplicationSettings();
+
+            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults());
+        }
+
+        public bool ConfirmClosingTabs
+        {
+            get => _applicationSettings.ConfirmClosingTabs;
+            set
+            {
+                if (_applicationSettings.ConfirmClosingTabs != value)
+                {
+                    _applicationSettings.ConfirmClosingTabs = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool ConfirmClosingWindows
+        {
+            get => _applicationSettings.ConfirmClosingWindows;
+            set
+            {
+                if (_applicationSettings.ConfirmClosingWindows != value)
+                {
+                    _applicationSettings.ConfirmClosingWindows = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public NewTerminalLocation NewTerminalLocation
+        {
+            get => _applicationSettings.NewTerminalLocation;
+            set
+            {
+                if (_applicationSettings.NewTerminalLocation != value && !_editingNewTerminalLocation)
+                {
+                    _editingNewTerminalLocation = true;
+                    _applicationSettings.NewTerminalLocation = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(WindowIsSelected));
+                    RaisePropertyChanged(nameof(TabIsSelected));
+                    _editingNewTerminalLocation = false;
+                }
+            }
+        }
+
+        public RelayCommand RestoreDefaultsCommand { get; }
+
+        public bool TabIsSelected
+        {
+            get => NewTerminalLocation == NewTerminalLocation.Tab;
+            set => NewTerminalLocation = NewTerminalLocation.Tab;
+        }
+
+        public bool WindowIsSelected
+        {
+            get => NewTerminalLocation == NewTerminalLocation.Window;
+            set => NewTerminalLocation = NewTerminalLocation.Window;
+        }
+
+        private async Task RestoreDefaults()
+        {
+            var result = await _dialogService.ShowDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel);
+
+            if (result == DialogButton.OK)
+            {
+                var defaults = _defaultValueProvider.GetDefaultApplicationSettings();
+                ConfirmClosingWindows = defaults.ConfirmClosingWindows;
+                ConfirmClosingTabs = defaults.ConfirmClosingTabs;
+                NewTerminalLocation = defaults.NewTerminalLocation;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/FluentTerminal.App/ViewModels/SettingsViewModel.cs b/FluentTerminal.App/ViewModels/SettingsViewModel.cs
index 976e585..73531d6 100644
--- a/FluentTerminal.App/ViewModels/SettingsViewModel.cs
+++ b/FluentTerminal.App/ViewModels/SettingsViewModel.cs
@@ -20,12 +20,12 @@ namespace FluentTerminal.App.ViewModels
         private readonly IDialogService _dialogService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
         private readonly ISettingsService _settingsService;
-        private ApplicationSettings _applicationSettings;
         private ThemeViewModel _selectedTheme;
         private ShellConfiguration _shellConfiguration;
         private TerminalOptions _terminalOptions;
 
         public KeyBindingsPageViewModel KeyBindings { get; }
+        public GeneralPageViewModel General { get; }
 
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
@@ -40,10 +40,10 @@ namespace FluentTerminal.App.ViewModels
 
             _shellConfiguration = _settingsService.GetShellConfiguration();
             _terminalOptions = _settingsService.GetTerminalOptions();
-            _applicationSettings = _settingsService.GetApplicationSettings();
             ShellType = _shellConfiguration.Shell;
 
             KeyBindings = new KeyBindingsPageViewModel(_settingsService, dialogService, _defaultValueProvider, _trayProcessCommunicationService);
+            General = new GeneralPageViewModel(_settingsService, dialogService, _defaultValueProvider);
 
             var activeThemeId = _settingsService.GetCurrentThemeId();
             foreach (var theme in _settingsService.GetThemes())
@@ -102,34 +102,6 @@ namespace FluentTerminal.App.ViewModels
             set => ShellType = ShellType.CMD;
         }
 
-        public bool ConfirmClosingTabs
-        {
-            get => _applicationSettings.ConfirmClosingTabs;
-            set
-            {
-                if (_applicationSettings.ConfirmClosingTabs != value)
-                {
-                    _applicationSettings.ConfirmClosingTabs = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool ConfirmClosingWindows
-        {
-            get => _applicationSettings.ConfirmClosingWindows;
-            set
-            {
-                if (_applicationSettings.ConfirmClosingWindows != value)
-                {
-                    _applicationSettings.ConfirmClosingWindows = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public RelayCommand CreateThemeCommand { get; set; }
 
         public bool CursorBlink
@@ -367,12 +339,6 @@ namespace FluentTerminal.App.ViewModels
                 FontFamily = defaults.FontFamily;
                 FontSize = defaults.FontSize;
             }
-            else if (result == DialogButton.OK && area == "general")
-            {
-                var defaults = _defaultValueProvider.GetDefaultApplicationSettings();
-                ConfirmClosingWindows = defaults.ConfirmClosingWindows;
-                ConfirmClosingTabs = defaults.ConfirmClosingTabs;
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/FluentTerminal.App/Views/MainPage.xaml b/FluentTerminal.App/Views/MainPage.xaml
index d327754..4b224b2 100644
--- a/FluentTerminal.App/Views/MainPage.xaml
+++ b/FluentTerminal.App/Views/MainPage.xaml
@@ -13,16 +13,6 @@
     mc:Ignorable="d">
     <Page.Resources>
         <converters:TerminalViewModelToViewConverter x:Key="TerminalViewModelToViewConverter" />
-        <converters:IntToVisibilityConverter
-            x:Key="OneToVisibleConverter"
-            Else="Collapsed"
-            If="1"
-            Then="Visible" />
-        <converters:IntToVisibilityConverter
-            x:Key="OneToCollapsedConverter"
-            Else="Visible"
-            If="1"
-            Then="Collapsed" />
     </Page.Resources>
     <Grid x:Name="Root">
         <Grid.Background>
@@ -51,7 +41,7 @@
                 Grid.Column="0"
                 IsHitTestVisible="False"
                 Style="{StaticResource WindowTitleTextBlockStyle}"
-                Text="{x:Bind ViewModel.Terminals[0].Title, Mode=OneWay}"
+                Text="{x:Bind ViewModel.Title, Mode=OneWay}"
                 Visibility="{x:Bind ViewModel.Terminals.Count, Mode=OneWay, Converter={StaticResource OneToVisibleConverter}}" />
             <ListView
                 x:Name="Tabs"
diff --git a/FluentTerminal.App/Views/SettingsPage.xaml.cs b/FluentTerminal.App/Views/SettingsPage.xaml.cs
index 46142bd..703decb 100644
--- a/FluentTerminal.App/Views/SettingsPage.xaml.cs
+++ b/FluentTerminal.App/Views/SettingsPage.xaml.cs
@@ -52,7 +52,7 @@ namespace FluentTerminal.App.Views
                 switch (item.Tag)
                 {
                     case "general":
-                        ContentFrame.Navigate(typeof(GeneralSettings), ViewModel);
+                        ContentFrame.Navigate(typeof(GeneralSettings), ViewModel.General);
                         break;
 
                     case "shell":
diff --git a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
index 6fa32d6..9d87681 100644
--- a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    NavigationCacheMode="Required"
     mc:Ignorable="d">
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
@@ -30,14 +29,18 @@
                 Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
                 DefaultLabelPosition="Right">
                 <AppBarButton
-                    Command="{Binding ViewModel.RestoreDefaultsCommand}"
-                    CommandParameter="general"
+                    Command="{x:Bind ViewModel.RestoreDefaultsCommand}"
                     Icon="Undo"
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
         <StackPanel Grid.Row="2" Margin="24,0,0,0">
-
+            <TextBlock Margin="0,0,0,8" Text="Open new terminals as" />
+            <RadioButton Content="Tab" IsChecked="{x:Bind ViewModel.TabIsSelected, Mode=TwoWay}" />
+            <RadioButton
+                Margin="0,0,0,24"
+                Content="Window"
+                IsChecked="{x:Bind ViewModel.WindowIsSelected, Mode=TwoWay}" />
             <ToggleSwitch
                 Margin="0,0,0,24"
                 Header="Ask before closing windows"
diff --git a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml.cs b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml.cs
index 7ff496f..0d8aea8 100644
--- a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml.cs
+++ b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml.cs
@@ -1,4 +1,4 @@
-using FluentTerminal.App.ViewModels;
+using FluentTerminal.App.ViewModels.Settings;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
@@ -6,7 +6,7 @@ namespace FluentTerminal.App.Views.SettingsPages
 {
     public sealed partial class GeneralSettings : Page
     {
-        public SettingsViewModel ViewModel { get; private set; }
+        public GeneralPageViewModel ViewModel { get; private set; }
 
         public GeneralSettings()
         {
@@ -15,7 +15,7 @@ namespace FluentTerminal.App.Views.SettingsPages
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.Parameter is SettingsViewModel viewModel)
+            if (e.Parameter is GeneralPageViewModel viewModel)
             {
                 ViewModel = viewModel;
             }
diff --git a/FluentTerminal.Models/ApplicationSettings.cs b/FluentTerminal.Models/ApplicationSettings.cs
index 5c3e7ef..7eb5adf 100644
--- a/FluentTerminal.Models/ApplicationSettings.cs
+++ b/FluentTerminal.Models/ApplicationSettings.cs
@@ -1,8 +1,11 @@
-namespace FluentTerminal.Models
+using FluentTerminal.Models.Enums;
+
+namespace FluentTerminal.Models
 {
     public class ApplicationSettings
     {
         public bool ConfirmClosingTabs { get; set; }
         public bool ConfirmClosingWindows { get; set; }
+        public NewTerminalLocation NewTerminalLocation { get; set; }
     }
 }
diff --git a/FluentTerminal.Models/Enums/NewTerminalLocation.cs b/FluentTerminal.Models/Enums/NewTerminalLocation.cs
new file mode 100644
index 0000000..b9cef9d
--- /dev/null
+++ b/FluentTerminal.Models/Enums/NewTerminalLocation.cs
@@ -0,0 +1,8 @@
+namespace FluentTerminal.Models.Enums
+{
+    public enum NewTerminalLocation
+    {
+        Tab,
+        Window
+    }
+}