diff --git a/src/App/App.csproj b/src/App/App.csproj
index 2649ac490..bd628bc3d 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -37,4 +37,10 @@
   <ItemGroup>
     <Folder Include="Pages\Accounts\" />
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Controls\CipherViewCell\CipherViewCell.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
new file mode 100644
index 000000000..b560b7862
--- /dev/null
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
+          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+          x:Class="Bit.App.Controls.CipherViewCell"
+          xmlns:controls="clr-namespace:Bit.App.Controls">
+
+    <ViewCell.View>
+        <StackLayout x:Name="_layout"
+                     Padding="10"
+                     x:DataType="controls:CipherViewCellViewModel">
+
+            <StackLayout.BindingContext>
+                <controls:CipherViewCellViewModel />
+            </StackLayout.BindingContext>
+
+            <Label Text="{Binding Cipher.Name}"
+                   LineBreakMode="NoWrap"
+                   FontSize="16" />
+
+        </StackLayout>
+    </ViewCell.View>
+
+</ViewCell>
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
new file mode 100644
index 000000000..9a77b5ebb
--- /dev/null
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -0,0 +1,34 @@
+using Bit.Core.Models.View;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public partial class CipherViewCell : ViewCell
+    {
+        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
+            nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
+
+        private CipherViewCellViewModel _viewModel;
+
+        public CipherViewCell()
+        {
+            InitializeComponent();
+            _viewModel = _layout.BindingContext as CipherViewCellViewModel;
+        }
+
+        public CipherView Cipher
+        {
+            get => GetValue(CipherProperty) as CipherView;
+            set => SetValue(CipherProperty, value);
+        }
+
+        protected override void OnPropertyChanged(string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+            if(propertyName == CipherProperty.PropertyName)
+            {
+                _viewModel.Cipher = Cipher;
+            }
+        }
+    }
+}
diff --git a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
new file mode 100644
index 000000000..728b3591c
--- /dev/null
+++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
@@ -0,0 +1,16 @@
+using Bit.Core.Models.View;
+using Bit.Core.Utilities;
+
+namespace Bit.App.Controls
+{
+    public class CipherViewCellViewModel : ExtendedViewModel
+    {
+        private CipherView _cipher;
+
+        public CipherView Cipher
+        {
+            get => _cipher;
+            set => SetProperty(ref _cipher, value);
+        }
+    }
+}
diff --git a/src/App/Pages/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/GroupingsPage/GroupingsPage.xaml
index b80c03b88..656ea2823 100644
--- a/src/App/Pages/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/GroupingsPage/GroupingsPage.xaml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.GroupingsPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:GroupingsPageViewModel"
-    Title="{Binding PageTitle}">
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Bit.App.Pages.GroupingsPage"
+             xmlns:pages="clr-namespace:Bit.App.Pages"
+             xmlns:controls="clr-namespace:Bit.App.Controls"
+             x:DataType="pages:GroupingsPageViewModel"
+             Title="{Binding PageTitle}">
 
     <ContentPage.BindingContext>
         <pages:GroupingsPageViewModel />
@@ -13,64 +13,50 @@
 
     <ContentPage.Resources>
         <ResourceDictionary>
-            <DataTemplate
-                x:Key="cipherTemplate"
-                x:DataType="pages:GroupingsPageListItem">
+            <DataTemplate x:Key="cipherTemplate"
+                          x:DataType="pages:GroupingsPageListItem">
+                <controls:CipherViewCell Cipher="{Binding Cipher}" />
+            </DataTemplate>
+
+            <DataTemplate x:Key="folderTemplate"
+                          x:DataType="pages:GroupingsPageListItem">
                 <ViewCell>
                     <StackLayout Padding="10">
-                        <Label 
-                            Text="{Binding Cipher.Name}"
-                            LineBreakMode="NoWrap"
-                            FontSize="16" />
+                        <Label Text="{Binding Folder.Name}"
+                               LineBreakMode="NoWrap"
+                               FontSize="16" />
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
 
-            <DataTemplate
-                x:Key="folderTemplate"
-                x:DataType="pages:GroupingsPageListItem">
+            <DataTemplate x:Key="collectionTemplate"
+                          x:DataType="pages:GroupingsPageListItem">
                 <ViewCell>
                     <StackLayout Padding="10">
-                        <Label 
-                            Text="{Binding Folder.Name}"
-                            LineBreakMode="NoWrap"
-                            FontSize="16" />
+                        <Label Text="{Binding Collection.Name}"
+                               LineBreakMode="NoWrap"
+                               FontSize="16" />
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
 
-            <DataTemplate
-                x:Key="collectionTemplate"
-                x:DataType="pages:GroupingsPageListItem">
-                <ViewCell>
-                    <StackLayout Padding="10">
-                        <Label 
-                            Text="{Binding Collection.Name}"
-                            LineBreakMode="NoWrap"
-                            FontSize="16" />
-                    </StackLayout>
-                </ViewCell>
-            </DataTemplate>
-
-            <pages:GroupingsPageListItemSelector
-                x:Key="listItemDataTemplateSelector"
-                CipherTemplate="{StaticResource cipherTemplate}"
-                FolderTemplate="{StaticResource folderTemplate}"
-                CollectionTemplate="{StaticResource collectionTemplate}" />
+            <pages:GroupingsPageListItemSelector x:Key="listItemDataTemplateSelector"
+                                                 CipherTemplate="{StaticResource cipherTemplate}"
+                                                 FolderTemplate="{StaticResource folderTemplate}"
+                                                 CollectionTemplate="{StaticResource collectionTemplate}" />
         </ResourceDictionary>
     </ContentPage.Resources>
 
     <StackLayout>
-        <ListView
-            x:Name="ItemsListView"
-            ItemsSource="{Binding Items}"
-            VerticalOptions="FillAndExpand"
-            HasUnevenRows="true"
-            RefreshCommand="{Binding LoadCommand}"
-            IsPullToRefreshEnabled="true"
-            IsRefreshing="{Binding Loading, Mode=OneWay}"
-            CachingStrategy="RecycleElement"
-            ItemTemplate="{StaticResource listItemDataTemplateSelector}">
+        <ListView x:Name="ItemsListView"
+                  ItemsSource="{Binding Items}"
+                  VerticalOptions="FillAndExpand"
+                  HasUnevenRows="true"
+                  RefreshCommand="{Binding LoadCommand}"
+                  IsPullToRefreshEnabled="true"
+                  IsRefreshing="{Binding Loading, Mode=OneWay}"
+                  CachingStrategy="RecycleElement"
+                  ItemTemplate="{StaticResource listItemDataTemplateSelector}">
         </ListView>
     </StackLayout>
 
diff --git a/src/Core/Utilities/ExtendedViewModel.cs b/src/Core/Utilities/ExtendedViewModel.cs
index 35d5ab789..62ac8df1a 100644
--- a/src/Core/Utilities/ExtendedViewModel.cs
+++ b/src/Core/Utilities/ExtendedViewModel.cs
@@ -9,8 +9,8 @@ namespace Bit.Core.Utilities
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        protected bool SetProperty<T>(ref T backingStore, T value, [CallerMemberName]string propertyName = "",
-            Action onChanged = null)
+        protected bool SetProperty<T>(ref T backingStore, T value, Action onChanged = null,
+            [CallerMemberName]string propertyName = "")
         {
             if(EqualityComparer<T>.Default.Equals(backingStore, value))
             {
@@ -18,14 +18,9 @@ namespace Bit.Core.Utilities
             }
 
             backingStore = value;
-            onChanged?.Invoke();
-            OnPropertyChanged(propertyName);
-            return true;
-        }
-
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = "")
-        {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            onChanged?.Invoke();
+            return true;
         }
     }
 }