diff --git a/src/App/Pages/Settings/FoldersPage.xaml.cs b/src/App/Pages/Settings/FoldersPage.xaml.cs
index eb3aa7f27..5066cfccb 100644
--- a/src/App/Pages/Settings/FoldersPage.xaml.cs
+++ b/src/App/Pages/Settings/FoldersPage.xaml.cs
@@ -51,8 +51,11 @@ namespace Bit.App.Pages
 
         private async void AddButton_Clicked(object sender, EventArgs e)
         {
-            var page = new FolderAddEditPage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
+            if(DoOnce())
+            {
+                var page = new FolderAddEditPage();
+                await Navigation.PushModalAsync(new NavigationPage(page));
+            }
         }
     }
 }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index 579ef0d27..b29adf34b 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -174,8 +174,11 @@ namespace Bit.App.Pages
 
         private async void AddButton_Clicked(object sender, System.EventArgs e)
         {
-            var page = new AddEditPage(null, _vm.Type, _vm.FolderId, _vm.CollectionId);
-            await Navigation.PushModalAsync(new NavigationPage(page));
+            if(DoOnce())
+            {
+                var page = new AddEditPage(null, _vm.Type, _vm.FolderId, _vm.CollectionId);
+                await Navigation.PushModalAsync(new NavigationPage(page));
+            }
         }
     }
 }