diff --git a/platform/platform-api/src/com/intellij/ui/speedSearch/ElementFilter.java b/platform/platform-api/src/com/intellij/ui/speedSearch/ElementFilter.java
index 8b5e783cfffd..ee5d5e386b70 100644
--- a/platform/platform-api/src/com/intellij/ui/speedSearch/ElementFilter.java
+++ b/platform/platform-api/src/com/intellij/ui/speedSearch/ElementFilter.java
@@ -36,6 +36,7 @@ public interface ElementFilter<T> {
 
       public ActionCallback fireUpdate(@Nullable final T preferredSelection, final boolean adjustSelection, final boolean now) {
         final ActionCallback result = new ActionCallback(myListeners.size());
+        
         for (final Listener<T> myListener : myListeners) {
           myListener.update(preferredSelection, adjustSelection, now).doWhenProcessed(result.createSetDoneRunnable());
         }
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
index c3503a7a78bf..cde78f033dbd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
@@ -30,6 +30,7 @@ import com.intellij.ui.SearchTextField;
 import com.intellij.ui.speedSearch.ElementFilter;
 import com.intellij.ui.treeStructure.SimpleNode;
 import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.event.DocumentEvent;
 import java.awt.event.MouseAdapter;
@@ -127,10 +128,6 @@ abstract class SettingsFilter extends ElementFilter.Active.Impl<SimpleNode> {
     return myHits != null && myHits.getNameHits().contains(configurable);
   }
 
-  ActionCallback update(boolean adjustSelection, boolean now) {
-    return update(DocumentEvent.EventType.CHANGE, adjustSelection, now);
-  }
-
   ActionCallback update(String text, boolean adjustSelection, boolean now) {
     try {
       myUpdateRejected = true;
@@ -139,10 +136,10 @@ abstract class SettingsFilter extends ElementFilter.Active.Impl<SimpleNode> {
     finally {
       myUpdateRejected = false;
     }
-    return update(adjustSelection, now);
+    return update(DocumentEvent.EventType.CHANGE, adjustSelection, now);
   }
 
-  private ActionCallback update(DocumentEvent.EventType type, boolean adjustSelection, boolean now) {
+  private ActionCallback update(@NotNull DocumentEvent.EventType type, boolean adjustSelection, boolean now) {
     if (myUpdateRejected) {
       return ActionCallback.REJECTED;
     }
diff --git a/plugins/settings-repository/src/git/pull.kt b/plugins/settings-repository/src/git/pull.kt
index 80b0e2059930..085fa7efacb8 100644
--- a/plugins/settings-repository/src/git/pull.kt
+++ b/plugins/settings-repository/src/git/pull.kt
@@ -48,7 +48,7 @@ open internal class Pull(val manager: GitRepositoryManager, val indicator: Progr
   val repository = manager.repository
 
   // we must use the same StoredConfig instance during the operation
-  val config = repository.config
+  val config = repository.config!!
   val remoteConfig = RemoteConfig(config, Constants.DEFAULT_REMOTE_NAME)
 
   fun pull(mergeStrategy: MergeStrategy = MergeStrategy.RECURSIVE, commitMessage: String? = null, prefetchedRefToMerge: Ref? = null): UpdateResult? {
diff --git a/plugins/settings-repository/src/git/reset.kt b/plugins/settings-repository/src/git/reset.kt
index 9e7ecd1979a2..e7158f9f1ff3 100644
--- a/plugins/settings-repository/src/git/reset.kt
+++ b/plugins/settings-repository/src/git/reset.kt
@@ -38,7 +38,7 @@ internal class Reset(manager: GitRepositoryManager, indicator: ProgressIndicator
     // grab added/deleted/renamed/modified files
     val mergeStrategy = if (toTheirs) MergeStrategy.THEIRS else MergeStrategy.OURS
 
-    var refToMerge = fetch()
+    val refToMerge = fetch()
     val mergeResult = if (refToMerge == null) null else merge(refToMerge, mergeStrategy, forceMerge = true, commitMessage = commitMessage)
     val firstMergeResult = mergeResult?.result
 
diff --git a/plugins/settings-repository/src/settings/repositoryListEditor.kt b/plugins/settings-repository/src/settings/repositoryListEditor.kt
index 41cecca6f9b9..5df928793174 100644
--- a/plugins/settings-repository/src/settings/repositoryListEditor.kt
+++ b/plugins/settings-repository/src/settings/repositoryListEditor.kt
@@ -114,6 +114,7 @@ private fun deleteRepository() {
     indicator.isIndeterminate = true
 
     repositoryManager.deleteRepository()
+    icsManager.repositoryActive = false
   }
 
   val store = ApplicationManager.getApplication().stateStore as ComponentStoreImpl