From 5a88a6670971d1f33d1c8fb227bc5eeb852ffb0c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 20 Oct 2017 16:51:30 -0400
Subject: [PATCH] next return if nextelement set later

---
 src/App/Controls/FormEntryCell.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/App/Controls/FormEntryCell.cs b/src/App/Controls/FormEntryCell.cs
index 074386373..9193e887d 100644
--- a/src/App/Controls/FormEntryCell.cs
+++ b/src/App/Controls/FormEntryCell.cs
@@ -21,8 +21,6 @@ namespace Bit.App.Controls
             Thickness? containerPadding = null,
             bool useButton = false)
         {
-            _nextElement = nextElement;
-
             if(!useLabelAsPlaceholder)
             {
                 Label = new Label
@@ -50,10 +48,7 @@ namespace Bit.App.Controls
                 Entry.Placeholder = labelText;
             }
 
-            if(nextElement != null)
-            {
-                Entry.ReturnType = Enums.ReturnType.Next;
-            }
+            NextElement = nextElement;
 
             var imageStackLayout = new StackLayout
             {
@@ -145,6 +140,14 @@ namespace Bit.App.Controls
             set
             {
                 _nextElement = value;
+                if(_nextElement != null && Entry != null)
+                {
+                    Entry.ReturnType = Enums.ReturnType.Next;
+                }
+                else if(Entry != null)
+                {
+                    Entry.ReturnType = null;
+                }
             }
         }