1 files changed, 10 insertions, 25 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
index e54e7399..23ffca59 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
@@ -35,48 +35,33 @@ namespace Xamarin.Forms.Platform.Tizen
 				};
 				entry.SetVerticalTextAlignment("elm.text", 0.5);
 				entry.SetVerticalTextAlignment("elm.guide", 0.5);
+				entry.TextChanged += OnTextChanged;
+				entry.Activated += OnCompleted;
 				SetNativeControl(entry);
 			}
-
-			if (e.OldElement != null)
-			{
-				Control.TextChanged -= EntryChangedHandler;
-				Control.Activated -= EntryCompletedHandler;
-			}
-
-			if (e.NewElement != null)
-			{
-				Control.TextChanged += EntryChangedHandler;
-				Control.Activated += EntryCompletedHandler;
-
-				Control.BatchBegin();
-			}
-
 			base.OnElementChanged(e);
 		}
 
 		protected override void Dispose(bool disposing)
 		{
-			if (null != Control)
+			if (disposing)
 			{
-				Control.TextChanged -= EntryChangedHandler;
-				Control.Activated -= EntryCompletedHandler;
+				if (null != Control)
+				{
+					Control.TextChanged -= OnTextChanged;
+					Control.Activated -= OnCompleted;
+				}
 			}
 
 			base.Dispose(disposing);
 		}
 
-		protected override void OnElementReady()
-		{
-			Control?.BatchCommit();
-		}
-
-		void EntryChangedHandler(object sender, EventArgs e)
+		void OnTextChanged(object sender, EventArgs e)
 		{
 			Element.Text = Control.Text;
 		}
 
-		void EntryCompletedHandler(object sender, EventArgs e)
+		void OnCompleted(object sender, EventArgs e)
 		{
 			//TODO Consider if any other object should overtake focus
 			Control.SetFocus(false);