diff --git a/src/App/App.csproj b/src/App/App.csproj
index a979c09be..ff19d424d 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -68,9 +68,6 @@
     <Compile Update="Pages\Vault\GroupingsPage\GroupingsPage.xaml.cs">
       <DependentUpon>GroupingsPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Pages\TabsPage.xaml.cs">
-      <DependentUpon>TabsPage.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml.cs b/src/App/Pages/Generator/GeneratorPage.xaml.cs
index a30a619b3..d5b9495c1 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml.cs
+++ b/src/App/Pages/Generator/GeneratorPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -6,17 +7,15 @@ namespace Bit.App.Pages
     public partial class GeneratorPage : BaseContentPage
     {
         private GeneratorPageViewModel _vm;
+        private readonly bool _fromTabPage;
         private readonly Action<string> _selectAction;
 
-        public GeneratorPage()
-            : this(null)
-        { }
-
-        public GeneratorPage(Action<string> selectAction)
+        public GeneratorPage(bool fromTabPage, Action<string> selectAction = null)
         {
             InitializeComponent();
             _vm = BindingContext as GeneratorPageViewModel;
             _vm.Page = this;
+            _fromTabPage = fromTabPage;
             _selectAction = selectAction;
             if(selectAction == null)
             {
@@ -24,10 +23,18 @@ namespace Bit.App.Pages
             }
         }
 
+        public async Task InitAsync()
+        {
+            await _vm.InitAsync();
+        }
+
         protected async override void OnAppearing()
         {
             base.OnAppearing();
-            await _vm.InitAsync();
+            if(!_fromTabPage)
+            {
+                await InitAsync();
+            }
         }
 
         private async void Regenerate_Clicked(object sender, EventArgs e)
diff --git a/src/App/Pages/TabsPage.cs b/src/App/Pages/TabsPage.cs
new file mode 100644
index 000000000..9227aafaa
--- /dev/null
+++ b/src/App/Pages/TabsPage.cs
@@ -0,0 +1,48 @@
+using Bit.App.Resources;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class TabsPage : TabbedPage
+    {
+        public TabsPage()
+        {
+            var groupingsPage = new NavigationPage(new GroupingsPage())
+            {
+                Title = AppResources.MyVault,
+                Icon = "lock.png"
+            };
+            Children.Add(groupingsPage);
+
+            var generatorPage = new NavigationPage(new GeneratorPage(true, null))
+            {
+                Title = AppResources.Generator,
+                Icon = "refresh.png"
+            };
+            Children.Add(generatorPage);
+
+            var settingsPage = new NavigationPage(new SettingsPage())
+            {
+                Title = AppResources.Settings,
+                Icon = "cogs.png"
+            };
+            Children.Add(settingsPage);
+
+            Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetToolbarPlacement(this,
+                Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement.Bottom);
+            Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSwipePagingEnabled(this, false);
+            Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSmoothScrollEnabled(this, false);
+        }
+
+        protected async override void OnCurrentPageChanged()
+        {
+            if(CurrentPage is NavigationPage navPage)
+            {
+                if(navPage.RootPage is GeneratorPage genPage)
+                {
+                    await genPage.InitAsync();
+                }
+            }
+        }
+    }
+}
diff --git a/src/App/Pages/TabsPage.xaml b/src/App/Pages/TabsPage.xaml
deleted file mode 100644
index 3b0db1f77..000000000
--- a/src/App/Pages/TabsPage.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<TabbedPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.TabsPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
-    android:TabbedPage.ToolbarPlacement="Bottom"
-    android:TabbedPage.IsSwipePagingEnabled="False">
-
-    <TabbedPage.Children>
-        <NavigationPage Title="My Vault">
-            <NavigationPage.Icon>
-                <FileImageSource File="lock.png"></FileImageSource>
-            </NavigationPage.Icon>
-            <x:Arguments>
-                <pages:GroupingsPage />
-            </x:Arguments>
-        </NavigationPage>
-
-        <NavigationPage Title="Generator">
-            <NavigationPage.Icon>
-                <FileImageSource File="refresh.png"></FileImageSource>
-            </NavigationPage.Icon>
-            <x:Arguments>
-                <pages:GeneratorPage />
-            </x:Arguments>
-        </NavigationPage>
-
-        <NavigationPage Title="Settings">
-            <NavigationPage.Icon>
-                <FileImageSource File="cogs.png"></FileImageSource>
-            </NavigationPage.Icon>
-            <x:Arguments>
-                <pages:SettingsPage />
-            </x:Arguments>
-        </NavigationPage>
-    </TabbedPage.Children>
-
-</TabbedPage>
diff --git a/src/App/Pages/TabsPage.xaml.cs b/src/App/Pages/TabsPage.xaml.cs
deleted file mode 100644
index 5844a392c..000000000
--- a/src/App/Pages/TabsPage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace Bit.App.Pages
-{
-    public partial class TabsPage : TabbedPage
-    {
-        public TabsPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/App/Pages/Vault/AddEditPageViewModel.cs b/src/App/Pages/Vault/AddEditPageViewModel.cs
index 5d6378dbd..ea02bdd40 100644
--- a/src/App/Pages/Vault/AddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/AddEditPageViewModel.cs
@@ -429,7 +429,7 @@ namespace Bit.App.Pages
                     return;
                 }
             }
-            var page = new GeneratorPage(async (password) =>
+            var page = new GeneratorPage(false, async (password) =>
             {
                 Cipher.Login.Password = password;
                 TriggerCipherChanged();
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index d273e376f..98e417c28 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -1698,6 +1698,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Generator.
+        /// </summary>
+        public static string Generator {
+            get {
+                return ResourceManager.GetString("Generator", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Get your master password hint.
         /// </summary>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 0e2e858f0..8b83ed8bb 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1460,4 +1460,8 @@
     <value>Clear</value>
     <comment>To clear something out. example: To clear browser history.</comment>
   </data>
+  <data name="Generator" xml:space="preserve">
+    <value>Generator</value>
+    <comment>Short for "Password Generator"</comment>
+  </data>
 </root>
\ No newline at end of file