diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs
index 934c546210..7ac241efb6 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs
@@ -51,6 +51,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 			if (textArea != null) {
 				textArea.GotKeyboardFocus -= TextAreaGotKeyboardFocus;
 				textArea.LostKeyboardFocus -= TextAreaLostKeyboardFocus;
+				textArea.OptionChanged -= TextAreaOptionChanged;
 				textArea = null;
 			}
 			ClearContext();