diff --git a/src/UWP/App.xaml.cs b/src/UWP/App.xaml.cs
index 8c5f82e18..4f302cab7 100644
--- a/src/UWP/App.xaml.cs
+++ b/src/UWP/App.xaml.cs
@@ -49,7 +49,8 @@ namespace Bit.UWP
                 var assembliesToInclude = new List<Assembly>()
                 {
                     typeof(CachedImage).GetTypeInfo().Assembly,
-                    typeof(CachedImageRenderer).GetTypeInfo().Assembly
+                    typeof(CachedImageRenderer).GetTypeInfo().Assembly,
+                    typeof(Controls.ExtendedTableViewRenderer).GetTypeInfo().Assembly
                 };
                 Xamarin.Forms.Forms.Init(e, assembliesToInclude);
 
diff --git a/src/UWP/Controls/ExtendedTableViewRenderer.cs b/src/UWP/Controls/ExtendedTableViewRenderer.cs
new file mode 100644
index 000000000..faf33080a
--- /dev/null
+++ b/src/UWP/Controls/ExtendedTableViewRenderer.cs
@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel;
+using Bit.App.Controls;
+using Bit.UWP.Controls;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.UWP;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+
+[assembly: ExportRenderer(typeof(ExtendedTableView), typeof(ExtendedTableViewRenderer))]
+namespace Bit.UWP.Controls
+{
+    public class ExtendedTableViewRenderer : TableViewRenderer
+    {
+        public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
+        {
+            var baseSize = new Size(Control.Width, Control.Height);
+
+            return new SizeRequest(new Size(baseSize.Width, baseSize.Height));
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<TableView> e)
+        {
+            base.OnElementChanged(e);
+        }
+    }
+}
diff --git a/src/UWP/UWP.csproj b/src/UWP/UWP.csproj
index 74692f481..caf6a0efd 100644
--- a/src/UWP/UWP.csproj
+++ b/src/UWP/UWP.csproj
@@ -95,6 +95,7 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\ExtendedTableViewRenderer.cs" />
     <Compile Include="IconConverter.cs" />
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>