diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionCopiedShortcutsTracker.kt b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionCopiedShortcutsTracker.kt
index 5050995f3068..8142ad0adec6 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionCopiedShortcutsTracker.kt
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionCopiedShortcutsTracker.kt
@@ -4,20 +4,18 @@ package com.intellij.openapi.actionSystem.ex
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
+import com.intellij.util.containers.CollectionFactory
 import org.jetbrains.annotations.ApiStatus.Internal
-import java.util.*
 
 @Service
 @Internal
 class ActionCopiedShortcutsTracker {
-  private val actionToSourceId = WeakHashMap<AnAction, String>()
+  private val actionToSourceId = CollectionFactory.createConcurrentWeakIdentityMap<AnAction, String>()
 
-  @Synchronized
   fun onActionCopiedFromId(action: AnAction, sourceId: String) {
     actionToSourceId[action] = sourceId
   }
 
-  @Synchronized
   fun getSourceId(action: AnAction): String? = actionToSourceId[action]
 
   companion object {