diff --git a/Samples/SimpleEditSample/MainWindow.xaml b/Samples/SimpleEditSample/MainWindow.xaml
index fd483f3..4dfbdcc 100644
--- a/Samples/SimpleEditSample/MainWindow.xaml
+++ b/Samples/SimpleEditSample/MainWindow.xaml
@@ -4,12 +4,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     xmlns:Controls="clr-namespace:System.Windows.Controls;assembly=DotNetProjects.TreeViewEx" 
     xmlns:Model="clr-namespace:W7StyleSample.Model" 
-    Title="MainWindow" Height="350" Width="261"
+    Title="MainWindow" Height="350" Width="521"
     AutomationProperties.Name="TestApp2Window" >
     <Window.Resources>
 		<Style TargetType="Controls:TreeViewExItem">
+            <EventSetter Event="OnEditing" Handler="TreeViewExItem_OnEditing" />
+            <EventSetter Event="OnEdited" Handler="TreeViewExItem_OnEdited" />
             <Setter Property="IsExpanded" Value="{Binding IsExpandedValue}"/>
             <Setter Property="IsEditable" Value="True" />
+            <Setter Property="IsEditing" Value="{Binding IsEditingValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             <Setter Property="TemplateEdit">
                 <Setter.Value>
                     <DataTemplate>
@@ -19,15 +22,26 @@
             </Setter>
         </Style>
 	</Window.Resources>
-    <DockPanel>
-        <Controls:TreeViewEx
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="261" />
+            <ColumnDefinition Width="260" />
+        </Grid.ColumnDefinitions>
+        <DockPanel Grid.Column="0">
+            <Controls:TreeViewEx
          AutomationProperties.Name="TestApp2Tree"
-         ItemsSource="{Binding Children}">
-            <Controls:TreeViewEx.ItemTemplate>
-                <HierarchicalDataTemplate ItemsSource="{Binding Children}" DataType="{x:Type Model:Node}">
-                    <TextBlock Text="{Binding}"/>
-                </HierarchicalDataTemplate>
-            </Controls:TreeViewEx.ItemTemplate>
-        </Controls:TreeViewEx>
-    </DockPanel>
+         SelectedItems="{Binding SelectedItems}"
+         ItemsSource="{Binding FirstNode.Children}">
+                <Controls:TreeViewEx.ItemTemplate>
+                    <HierarchicalDataTemplate ItemsSource="{Binding Children}" DataType="{x:Type Model:Node}">
+                        <TextBlock Text="{Binding}"/>
+                    </HierarchicalDataTemplate>
+                </Controls:TreeViewEx.ItemTemplate>
+            </Controls:TreeViewEx>
+        </DockPanel>
+        <StackPanel Grid.Column="1">
+            <Button VerticalAlignment="Top" Content="Click me to edit selected item" Command="{Binding IsEditingCommand}" />
+            <TextBlock Margin="5 10 0 0" Text="{Binding EditedText, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+        </StackPanel>
+    </Grid>
 </Window>
diff --git a/Samples/SimpleEditSample/MainWindow.xaml.cs b/Samples/SimpleEditSample/MainWindow.xaml.cs
index 02fb6a4..1c60acb 100644
--- a/Samples/SimpleEditSample/MainWindow.xaml.cs
+++ b/Samples/SimpleEditSample/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 namespace W7StyleSample
 {
+    using TreeViewEx.SimpleSample.ViewModel;
     #region
 
     using W7StyleSample.Model;
@@ -15,37 +16,29 @@ public partial class MainWindow
 
         public MainWindow()
         {
-            var firstNode = new Node { Name = "element" };
-            var first1 = new Node { Name = "element1" };
-            var first2 = new Node { Name = "element2" };
-            var first11 = new Node { Name = "element11" };
-            var first12 = new Node { Name = "element12" };
-            var first13 = new Node { Name = "element13", IsExpandedValue = false };
-            var first14 = new Node { Name = "element14", IsExpandedValue = false };
-            var first15 = new Node { Name = "element15" };
-            var first131 = new Node { Name = "element131" };
-            var first132 = new Node { Name = "element132" };
-
-            for (int i = 1; i <= 50; i++)
-            {
-                first14.Children.Add(new Node { Name = "element14_" + i });
-            }
-
-            firstNode.Children.Add(first1);
-            firstNode.Children.Add(first2);
-            first1.Children.Add(first11);
-            first1.Children.Add(first12);
-            first1.Children.Add(first13);
-            first1.Children.Add(first14);
-            first1.Children.Add(first15);
-            first13.Children.Add(first131);
-            first13.Children.Add(first132);
-
-            DataContext = firstNode;
+            DataContext = new MainWindowViewModel();
 
             InitializeComponent();
         }
 
         #endregion
+
+        private void TreeViewExItem_OnEditing(object sender, System.Windows.RoutedEventArgs e)
+        {
+            var tvei = (System.Windows.Controls.TreeViewExItem)sender;
+            Node nodeContext = (Node)tvei.DataContext;
+            var viewModel = (MainWindowViewModel)DataContext;
+            viewModel.EditedText = $"{nodeContext.Name} is being edited.";
+            e.Handled = true;
+        }
+
+        private void TreeViewExItem_OnEdited(object sender, System.Windows.RoutedEventArgs e)
+        {
+            var tvei = (System.Windows.Controls.TreeViewExItem)sender;
+            Node nodeContext = (Node)tvei.DataContext;
+            var viewModel = (MainWindowViewModel)DataContext;
+            viewModel.EditedText = $"{nodeContext.Name} was edited.";
+            e.Handled = true;
+        }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleEditSample/Model/Node.cs b/Samples/SimpleEditSample/Model/Node.cs
index 34160c5..1febe00 100644
--- a/Samples/SimpleEditSample/Model/Node.cs
+++ b/Samples/SimpleEditSample/Model/Node.cs
@@ -3,13 +3,14 @@
 	#region
 
 	using System.Collections.ObjectModel;
+    using System.ComponentModel;
 
-	#endregion
+    #endregion
 
-	/// <summary>
-	/// Model for testing
-	/// </summary>
-	public class Node
+    /// <summary>
+    /// Model for testing
+    /// </summary>
+    public class Node : INotifyPropertyChanged
 	{
 		#region Constructors and Destructors
 
@@ -27,6 +28,19 @@ public Node()
         string name;
         public string Name { get { return name; } set { name = value; } }
         public bool IsExpandedValue { get; set; }
+		private bool _isEditingValue;
+
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		public bool IsEditingValue 
+		{
+			get => _isEditingValue;
+			set
+			{
+				_isEditingValue = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsEditingValue)));
+			}
+		}
 		#endregion
 
 		#region Public Methods
diff --git a/Samples/SimpleEditSample/RelayCommand.cs b/Samples/SimpleEditSample/RelayCommand.cs
new file mode 100644
index 0000000..9d8a9c9
--- /dev/null
+++ b/Samples/SimpleEditSample/RelayCommand.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+
+namespace DragNDropSample
+{
+    public class RelayCommand : ICommand
+    {
+        #region Fields
+
+        readonly Action<object> execute;
+        readonly Predicate<object> canExecute;
+
+        #endregion // Fields
+
+        #region Constructors
+
+        public RelayCommand(Action<object> execute)
+            : this(execute, null)
+        {
+        }
+
+        public RelayCommand(Action<object> execute, Predicate<object> canExecute)
+        {
+            if (execute == null)
+                throw new ArgumentNullException("execute");
+
+            this.execute = execute;
+            this.canExecute = canExecute;
+        }
+        #endregion // Constructors
+
+        #region ICommand Members
+
+        [DebuggerStepThrough]
+        public bool CanExecute(object parameter)
+        {
+            return canExecute == null ? true : canExecute(parameter);
+        }
+
+        public event EventHandler CanExecuteChanged
+        {
+            add { CommandManager.RequerySuggested += value; }
+            remove { CommandManager.RequerySuggested -= value; }
+        }
+
+        public void Execute(object parameter)
+        {
+            execute(parameter);
+        }
+
+        #endregion // ICommand Members
+    }
+}
diff --git a/Samples/SimpleEditSample/SimpleEditSample.csproj b/Samples/SimpleEditSample/SimpleEditSample.csproj
index 16dff66..eac17ef 100644
--- a/Samples/SimpleEditSample/SimpleEditSample.csproj
+++ b/Samples/SimpleEditSample/SimpleEditSample.csproj
@@ -75,6 +75,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="RelayCommand.cs" />
+    <Compile Include="ViewModel\MainWindowViewModel.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Samples/SimpleEditSample/ViewModel/MainWindowViewModel.cs b/Samples/SimpleEditSample/ViewModel/MainWindowViewModel.cs
new file mode 100644
index 0000000..9992d72
--- /dev/null
+++ b/Samples/SimpleEditSample/ViewModel/MainWindowViewModel.cs
@@ -0,0 +1,81 @@
+using DragNDropSample;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+using W7StyleSample.Model;
+
+namespace TreeViewEx.SimpleSample.ViewModel
+{
+    public class MainWindowViewModel : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private ICommand _isEditingCommand;
+        public ICommand IsEditingCommand
+        {
+            get
+            {
+                if (_isEditingCommand == null)
+                    _isEditingCommand = new RelayCommand(EditItem);
+                return _isEditingCommand;
+            }
+        }
+
+        public Node FirstNode { get; set; }
+        public ObservableCollection<Node> SelectedItems { get; set; }
+        private string _editedText;
+        public string EditedText 
+        {
+            get => _editedText;
+            set
+            {
+                _editedText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(EditedText)));
+            }
+        }
+        public bool IsButtonEditEnabled
+        {
+            get { return SelectedItems.Count == 1; }
+        }
+
+        public MainWindowViewModel()
+        {
+            SelectedItems = new ObservableCollection<Node>();
+            FirstNode = new Node { Name = "element" };
+            var first1 = new Node { Name = "element1" };
+            var first2 = new Node { Name = "element2" };
+            var first11 = new Node { Name = "element11" };
+            var first12 = new Node { Name = "element12" };
+            var first13 = new Node { Name = "element13", IsExpandedValue = false };
+            var first14 = new Node { Name = "element14", IsExpandedValue = false };
+            var first15 = new Node { Name = "element15" };
+            var first131 = new Node { Name = "element131" };
+            var first132 = new Node { Name = "element132" };
+
+            for (int i = 1; i <= 50; i++)
+            {
+                first14.Children.Add(new Node { Name = "element14_" + i });
+            }
+
+            FirstNode.Children.Add(first1);
+            FirstNode.Children.Add(first2);
+            first1.Children.Add(first11);
+            first1.Children.Add(first12);
+            first1.Children.Add(first13);
+            first1.Children.Add(first14);
+            first1.Children.Add(first15);
+            first13.Children.Add(first131);
+            first13.Children.Add(first132);
+        }
+
+        private void EditItem(object parameter)
+        {
+            if (SelectedItems.Any())
+                SelectedItems[0].IsEditingValue = !SelectedItems[0].IsEditingValue;
+        }
+    }
+}
diff --git a/TreeViewEx/Controls/IsEditingManager.cs b/TreeViewEx/Controls/IsEditingManager.cs
index 036ed69..af83349 100644
--- a/TreeViewEx/Controls/IsEditingManager.cs
+++ b/TreeViewEx/Controls/IsEditingManager.cs
@@ -19,24 +19,30 @@ public IsEditingManager(TreeViewEx treeview)
         internal override void OnMouseDown(MouseButtonEventArgs e)
         {
             base.OnMouseDown(e);
-            StopEditing();
+            StopEditing(true);
         }
 
         public void StartEditing(TreeViewExItem item)
         {
-            StopEditing();
+            StopEditing(false);
             editedItem = item;
+            editedItem.IsEditingCallbackEnabled = false;
             editedItem.IsEditing = true;
+            editedItem.IsEditingCallbackEnabled = true;
         }
 
-        internal void StopEditing()
+        internal void StopEditing(bool raiseEvent)
         {
             if (editedItem == null) return;
 
             Keyboard.Focus(editedItem);
+            editedItem.IsEditingCallbackEnabled = false;
             editedItem.IsEditing = false;
+            editedItem.IsEditingCallbackEnabled = true;
             FocusHelper.Focus(editedItem);
+            if(raiseEvent)
+                editedItem.RaiseOnEdited();
             editedItem = null;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TreeViewEx/Controls/TreeViewExItem.cs b/TreeViewEx/Controls/TreeViewExItem.cs
index beda6bd..e3061bd 100644
--- a/TreeViewEx/Controls/TreeViewExItem.cs
+++ b/TreeViewEx/Controls/TreeViewExItem.cs
@@ -57,7 +57,25 @@ public partial class TreeViewExItem : HeaderedItemsControl
         public static readonly DependencyProperty IndentationProperty =
             DependencyProperty.Register("Indentation", typeof(double), typeof(TreeViewExItem), new PropertyMetadata(10.0));
 
+        public static readonly RoutedEvent OnEditingEvent = EventManager.RegisterRoutedEvent(
+        "OnEditing", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(TreeViewExItem));
 
+        // Provide CLR accessors for the event
+        public event RoutedEventHandler OnEditing
+        {
+            add { AddHandler(OnEditingEvent, value); }
+            remove { RemoveHandler(OnEditingEvent, value); }
+        }
+
+        public static readonly RoutedEvent OnEditedEvent = EventManager.RegisterRoutedEvent(
+        "OnEdited", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(TreeViewExItem));
+
+        // Provide CLR accessors for the event
+        public event RoutedEventHandler OnEdited
+        {
+            add { AddHandler(OnEditedEvent, value); }
+            remove { RemoveHandler(OnEditedEvent, value); }
+        }
         #endregion
 
         // Using a DependencyProperty as the backing store for Offset.  This enables animation, styling, binding, etc...
@@ -119,11 +137,12 @@ public bool IsEditing
                 return (bool)GetValue(IsEditingProperty);
             }
 
-            internal set
+            set
             {
                 SetValue(IsEditingProperty, value);
             }
         }
+        internal bool IsEditingCallbackEnabled { get; set; } = true;
 
         public double Indentation
         {
@@ -275,9 +294,24 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
 
         private static void OnIsEditingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (d is TreeViewEx || d is TreeViewExItem) return;
+            var item = d as TreeViewExItem;
+            if (item == null)
+                return;
+
+            if (item.IsEditingCallbackEnabled)
+            {
+                if ((bool)e.NewValue == true)
+                    item.StartEditing();
+                else
+                {
+                    item.StopEditing();
+                }
+            }
 
-            throw new InvalidOperationException("IsEditing can only be set internally");
+            //if (d is TreeViewEx || d is TreeViewExItem)
+            //    return;
+
+            //throw new InvalidOperationException("IsEditing can only be set internally");
         }
 
         /// <summary>
@@ -394,8 +428,9 @@ protected override void OnKeyDown(KeyEventArgs e)
 
         private bool StartEditing()
         {
-            if ((TemplateEdit != null || TemplateSelectorEdit != null) && IsFocused && IsEditable)
+            if ((TemplateEdit != null || TemplateSelectorEdit != null) && IsEditable)
             {
+                RaiseEvent(new RoutedEventArgs(OnEditingEvent));
                 ParentTreeView.IsEditingManager.StartEditing(this);
                 return true;
             }
@@ -467,7 +502,12 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
 
         private void StopEditing()
         {
-            ParentTreeView.IsEditingManager.StopEditing();
+            ParentTreeView.IsEditingManager.StopEditing(true);
+        }
+
+        internal void RaiseOnEdited()
+        {
+            RaiseEvent(new RoutedEventArgs(OnEditedEvent));
         }
 
         #endregion