diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index a767afcf4..c33a47e9f 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -79,6 +79,7 @@
                 </StackLayout>
 
                 <controls:ExtendedListView
+                    x:Name="_listView"
                     IsVisible="{Binding ShowList}"
                     ItemsSource="{Binding GroupedItems}"
                     VerticalOptions="FillAndExpand"
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index 85c8e109f..33bb4744d 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -1,4 +1,5 @@
 using Bit.App.Abstractions;
+using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.Core;
 using Bit.Core.Abstractions;
@@ -26,6 +27,7 @@ namespace Bit.App.Pages
         {
             _pageName = string.Concat(nameof(GroupingsPage), "_", DateTime.UtcNow.Ticks);
             InitializeComponent();
+            ListView = _listView;
             SetActivityIndicator(_mainContent);
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
@@ -57,6 +59,8 @@ namespace Bit.App.Pages
             }
         }
 
+        public ExtendedListView ListView { get; set; }
+
         protected async override void OnAppearing()
         {
             base.OnAppearing();
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
index 62a4717a4..a5572a777 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -127,6 +127,7 @@ namespace Bit.App.Pages
             ShowList = false;
             ShowAddCipherButton = true;
             var groupedItems = new List<GroupingsPageListGroup>();
+            var page = Page as GroupingsPage;
 
             try
             {
@@ -203,7 +204,12 @@ namespace Bit.App.Pages
                         ciphersListItems.Count, Device.RuntimePlatform == Device.iOS,
                         !MainPage && !groupedItems.Any()));
                 }
+                // Workaround for https://stackoverflow.com/a/49992132/1090359
+                page.ListView.HasUnevenRows = false;
+                page.ListView.IsGroupingEnabled = false;
                 GroupedItems.ResetWithRange(groupedItems);
+                page.ListView.HasUnevenRows = true;
+                page.ListView.IsGroupingEnabled = true;
             }
             finally
             {