diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs
index 8b7e981d6..299c2985a 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs
@@ -1,4 +1,6 @@
-using eShopOnContainers.Services;
+using eShopOnContainers.Core;
+using eShopOnContainers.Core.Helpers;
+using eShopOnContainers.Services;
 using System.Threading.Tasks;
 
 namespace eShopOnContainers.ViewModels.Base
@@ -28,6 +30,7 @@ namespace eShopOnContainers.ViewModels.Base
         {
             DialogService = ViewModelLocator.Instance.Resolve<IDialogService>();
             NavigationService = ViewModelLocator.Instance.Resolve<INavigationService>();
+            GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase;
         }
 
         public virtual Task InitializeAsync(object navigationData)
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
index 0d529e65f..b1bbceb31 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
@@ -3,11 +3,14 @@ using eShopOnContainers.ViewModels.Base;
 using eShopOnContainers.Core.Models.Navigation;
 using Xamarin.Forms;
 using eShopOnContainers.Core.ViewModels.Base;
+using System.Windows.Input;
 
 namespace eShopOnContainers.Core.ViewModels
 {
     public class MainViewModel : ViewModelBase
-    {        
+    {
+        public ICommand SettingsCommand => new Command(Settings);
+
         public override Task InitializeAsync(object navigationData)
         {
             IsBusy = true;
@@ -21,5 +24,10 @@ namespace eShopOnContainers.Core.ViewModels
 
             return base.InitializeAsync(navigationData);
         }
+
+        private void Settings()
+        {
+            NavigationService.NavigateToAsync<SettingsViewModel>();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
index db3f38a7f..1fa5b54b6 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
@@ -102,7 +102,6 @@ namespace eShopOnContainers.Core.ViewModels
         {
             // Update remote endpoint (save to local storage)
             Settings.UrlBase = endpoint;
-            GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
index 7dd72ced1..117d17dbd 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
@@ -18,8 +18,6 @@ namespace eShopOnContainers.Core.Views
 
         protected override async void OnAppearing()
         {
-            GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase;
-
             var content = this.Content;
             this.Content = null;
             this.Content = content;
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
index 260a66a5c..2bf39db64 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
@@ -13,6 +13,19 @@
             iOS="eShop on Containers"
             WinPhone="eShop on Containers"/>
     </TabbedPage.Title>
+    <ContentPage.ToolbarItems>
+        <ToolbarItem 
+            Command="{Binding SettingsCommand}"
+            Text="Settings">
+            <ToolbarItem.Icon>
+                <OnPlatform 
+                    x:TypeArguments="FileImageSource"
+                    WinPhone="Assets/app_settings.png"
+                    Android="app_settings"
+                    iOS="app_settings"/>
+            </ToolbarItem.Icon>
+        </ToolbarItem>
+    </ContentPage.ToolbarItems>
     <!-- CATALOG -->
     <views:CatalogView  
         x:Name="HomeView">