1 files changed, 11 insertions, 26 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
index 7209eae9..d5ca750b 100755..100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
@@ -25,47 +25,32 @@ namespace Xamarin.Forms.Platform.Tizen
 					IsSingleLine = false,
 					PropagateEvents = false,
 				};
-				SetNativeControl(entry);
-			}
-
-			if (e.OldElement != null)
-			{
-				Control.TextChanged -= TextChanged;
-				Control.Unfocused -= Completed;
-			}
-
-			if (e.NewElement != null)
-			{
-				Control.TextChanged += TextChanged;
-				Control.Unfocused += Completed;
+				entry.TextChanged += OnTextChanged;
+				entry.Unfocused += OnCompleted;
 
-				Control.BatchBegin();
+				SetNativeControl(entry);
 			}
-
 			base.OnElementChanged(e);
 		}
 		protected override void Dispose(bool disposing)
 		{
-			if (null != Control)
+			if (disposing)
 			{
-				Control.TextChanged -= TextChanged;
-				Control.Activated -= Completed;
+				if (null != Control)
+				{
+					Control.TextChanged -= OnTextChanged;
+					Control.Activated -= OnCompleted;
+				}
 			}
-
 			base.Dispose(disposing);
 		}
 
-		protected override void OnElementReady()
-		{
-			Control?.BatchCommit();
-		}
-
-		void TextChanged(object sender, EventArgs e)
+		void OnTextChanged(object sender, EventArgs e)
 		{
 			Element.Text = ((Native.Entry)sender).Text;
 		}
 
-		void Completed(object sender, EventArgs e)
+		void OnCompleted(object sender, EventArgs e)
 		{
 			Element.SendCompleted();
 		}