diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/SearchHandlerAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/SearchHandlerAppearanceTracker.cs index ef60072b7a95..8d7d9bc1a404 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/SearchHandlerAppearanceTracker.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/SearchHandlerAppearanceTracker.cs @@ -270,6 +270,9 @@ protected virtual void Dispose(bool disposing) if (_searchHandler != null) { _searchHandler.PropertyChanged -= SearchHandlerPropertyChanged; + } + if (_editText != null) + { _editText.FocusChange -= EditTextFocusChange; } _searchHandler = null; @@ -282,4 +285,4 @@ public void Dispose() Dispose(true); } } -} \ No newline at end of file +}