diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index 307cd8af4..4d141a64e 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -15,6 +15,8 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
+            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+                         x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Text="{u:I18n Select}"
                      Clicked="Select_Clicked"
                      Order="Primary"
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml.cs b/src/App/Pages/Generator/GeneratorPage.xaml.cs
index cd61d2f29..5e43b72aa 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml.cs
+++ b/src/App/Pages/Generator/GeneratorPage.xaml.cs
@@ -22,15 +22,22 @@ namespace Bit.App.Pages
             _selectAction = selectAction;
             if(selectAction != null)
             {
+                if(Device.RuntimePlatform == Device.iOS)
+                {
+                    ToolbarItems.Add(_closeItem);
+                }
                 ToolbarItems.Add(_selectItem);
             }
-            if(Device.RuntimePlatform == Device.iOS)
-            {
-                ToolbarItems.Add(_moreItem);
-            }
             else
             {
-                ToolbarItems.Add(_historyItem);
+                if(Device.RuntimePlatform == Device.iOS)
+                {
+                    ToolbarItems.Add(_moreItem);
+                }
+                else
+                {
+                    ToolbarItems.Add(_historyItem);
+                }
             }
         }
 
@@ -98,5 +105,13 @@ namespace Bit.App.Pages
         {
             await _vm.SliderChangedAsync();
         }
+
+        private async void Close_Clicked(object sender, EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }