diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index 16d2cfd99..8df6d74fa 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -124,14 +124,34 @@
                             Grid.Column="3"
                             Grid.RowSpan="2" />
                     </Grid>
-                    <StackLayout StyleClass="box-row">
+
+                    <Grid StyleClass="box-row, box-row-input">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                         <Label
                             Text="{u:I18n AuthenticatorKey}"
-                            StyleClass="box-label" />
+                            StyleClass="box-label"
+                            Grid.Row="0"
+                            Grid.Column="0" />
                         <controls:MonoEntry
                             Text="{Binding Cipher.Login.Totp}"
-                            StyleClass="box-value" />
-                    </StackLayout>
+                            StyleClass="box-value"
+                            Grid.Row="1"
+                            Grid.Column="0" />
+                        <controls:FaButton 
+                            StyleClass="box-row-button, box-row-button-platform"
+                            Text="&#xf030;"
+                            Clicked="ScanTotp_Clicked"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Grid.RowSpan="2" />
+                    </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
                     <StackLayout StyleClass="box-row, box-row-input">
diff --git a/src/App/Pages/Vault/AddEditPage.xaml.cs b/src/App/Pages/Vault/AddEditPage.xaml.cs
index 569c94a49..5d23b056f 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/AddEditPage.xaml.cs
@@ -157,5 +157,21 @@ namespace Bit.App.Pages
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
+
+        private async void ScanTotp_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                var page = new ScanPage(key =>
+                {
+                    Device.BeginInvokeOnMainThread(async () =>
+                    {
+                        await Navigation.PopModalAsync();
+                        await _vm.UpdateTotpKeyAsync(key);
+                    });
+                });
+                await Navigation.PushModalAsync(new NavigationPage(page));
+            }
+        }
     }
 }
diff --git a/src/App/Pages/Vault/AddEditPageViewModel.cs b/src/App/Pages/Vault/AddEditPageViewModel.cs
index 49b2a518f..c4644f11e 100644
--- a/src/App/Pages/Vault/AddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/AddEditPageViewModel.cs
@@ -576,6 +576,23 @@ namespace Bit.App.Pages
             ShowCardCode = !ShowCardCode;
         }
 
+        public async Task UpdateTotpKeyAsync(string key)
+        {
+            if(Cipher?.Login != null)
+            {
+                if(!string.IsNullOrWhiteSpace(key))
+                {
+                    Cipher.Login.Totp = key;
+                    TriggerCipherChanged();
+                    _platformUtilsService.ShowToast("info", null, AppResources.AuthenticatorKeyAdded);
+                }
+                else
+                {
+                    await _platformUtilsService.ShowDialogAsync(AppResources.AuthenticatorKeyReadError);
+                }
+            }
+        }
+
         private void TypeChanged()
         {
             if(Cipher != null && TypeSelectedIndex > -1)
diff --git a/src/App/Pages/Vault/ScanPage.xaml b/src/App/Pages/Vault/ScanPage.xaml
index e3f6c7ef0..b6b6fff8a 100644
--- a/src/App/Pages/Vault/ScanPage.xaml
+++ b/src/App/Pages/Vault/ScanPage.xaml
@@ -46,7 +46,7 @@
                 Grid.Row="0"
                 VerticalOptions="Center"
                 HorizontalOptions="Center"
-                BackgroundColor="White" />
+                TextColor="White" />
 
             <BoxView
                 Grid.Column="0"
@@ -70,7 +70,7 @@
                 Grid.Row="2"
                 VerticalOptions="Center"
                 HorizontalOptions="Center"
-                BackgroundColor="White" />
+                TextColor="White" />
         </Grid>
 
     </Grid>
diff --git a/src/App/Pages/Vault/ScanPage.xaml.cs b/src/App/Pages/Vault/ScanPage.xaml.cs
index 4937dd88d..8d61854bd 100644
--- a/src/App/Pages/Vault/ScanPage.xaml.cs
+++ b/src/App/Pages/Vault/ScanPage.xaml.cs
@@ -14,13 +14,13 @@ namespace Bit.App.Pages
         public ScanPage(Action<string> callback)
         {
             _callback = callback;
+            InitializeComponent();
             _zxing.Options = new ZXing.Mobile.MobileBarcodeScanningOptions
             {
                 UseNativeScanning = true,
                 PossibleFormats = new List<ZXing.BarcodeFormat> { ZXing.BarcodeFormat.QR_CODE },
                 AutoRotate = false,
             };
-            InitializeComponent();
         }
 
         protected override void OnAppearing()