diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHPRTimelineFileEditor.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHPRTimelineFileEditor.kt
index c0529f145be8..82904585dc58 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHPRTimelineFileEditor.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHPRTimelineFileEditor.kt
@@ -2,11 +2,13 @@
 package org.jetbrains.plugins.github.pullrequest
 
 import com.intellij.collaboration.async.CompletableFutureUtil.handleOnEdt
-import com.intellij.collaboration.ui.CollaborationToolsUIUtil
 import com.intellij.diff.util.FileEditorBase
 import com.intellij.ide.DataManager
 import com.intellij.openapi.application.ApplicationBundle
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.editor.colors.EditorColorsListener
 import com.intellij.openapi.editor.colors.EditorColorsManager
+import com.intellij.openapi.editor.colors.EditorColorsManager.TOPIC
 import com.intellij.openapi.project.Project
 import com.intellij.ui.AnimatedIcon
 import com.intellij.util.ui.SingleComponentCenteringLayout
@@ -44,11 +46,12 @@ internal class GHPRTimelineFileEditor(private val project: Project,
   override fun getComponent() = content
 
   private fun createContent(): JComponent {
-    return doCreateContent().also {
-      CollaborationToolsUIUtil.overrideUIDependentProperty(it) {
-        isOpaque = true
-        background = EditorColorsManager.getInstance().globalScheme.defaultBackground
-      }
+    return doCreateContent().apply {
+      isOpaque = true
+      background = EditorColorsManager.getInstance().globalScheme.defaultBackground
+    }.also {
+      ApplicationManager.getApplication().messageBus.connect(this)
+        .subscribe(TOPIC, EditorColorsListener { scheme -> it.background = scheme?.defaultBackground })
 
       val prevProvider = DataManager.getDataProvider(it)
       DataManager.registerDataProvider(it) { dataId ->