diff --git a/src/Android/Controls/ExtendedTableViewRenderer.cs b/src/Android/Controls/ExtendedTableViewRenderer.cs
index 8737a6f3d..69b2bd79e 100644
--- a/src/Android/Controls/ExtendedTableViewRenderer.cs
+++ b/src/Android/Controls/ExtendedTableViewRenderer.cs
@@ -97,13 +97,18 @@ namespace Bit.Android.Controls
 
                 bool isHeader, nextIsHeader;
                 var cell = GetCellForPosition(position, out isHeader, out nextIsHeader);
+                var cellView = CellFactory.GetCell(cell, convertView, parent, Context, _view);
                 if(layout.ChildCount > 0)
                 {
                     layout.RemoveViewAt(0);
-                    var cellView = CellFactory.GetCell(cell, convertView, parent, Context, _view);
                     layout.AddView(cellView, 0);
                 }
 
+                if(cellView.HasFocus)
+                {
+                    cellView.ClearFocus();
+                }
+
                 if(isHeader)
                 {
                     var textCell = layout.GetChildAt(0) as BaseCellView;